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/05/24 03:49:46 UTC
svn commit: r1597233 [1/4] - in /tomee/tomee/trunk: ./
arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/
arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/deployment/
arquillian/arquillian-co...
Author: tveronezi
Date: Sat May 24 01:49:45 2014
New Revision: 1597233
URL: http://svn.apache.org/r1597233
Log:
The styles (pmd and checkstyle) will be checked by the 'style' profile.
Applying checkstyle/pmd changes to our arquillian code.
Removed:
tomee/tomee/trunk/Makefile
Modified:
tomee/tomee/trunk/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/ArquillianUtil.java
tomee/tomee/trunk/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/deployment/DeploymentExceptionObserver.java
tomee/tomee/trunk/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/deployment/DeploymentExceptionProvider.java
tomee/tomee/trunk/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/enrichment/OpenEJBEnricher.java
tomee/tomee/trunk/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/mockito/MockitoEnricher.java
tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBArchiveProcessor.java
tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBConfiguration.java
tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBDeployableContainer.java
tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBExtension.java
tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBInjectionEnricher.java
tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/SWClassLoader.java
tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/TestObserver.java
tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/cucumber/ArchiveResourceIteratorFactory.java
tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/server/ServiceManagers.java
tomee/tomee/trunk/arquillian/arquillian-openejb-transaction-provider/src/main/java/org/apache/openejb/arquillian/transaction/OpenEJBTransactionProvider.java
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ArquillianFilterRunner.java
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ArquillianRuntimeException.java
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/BeanDicovererInstaller.java
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ConfigurationOverrides.java
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/DownloadException.java
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Files.java
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/IO.java
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/MavenCache.java
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ObjectMap.java
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Prefixes.java
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/RemoteInitialContextObserver.java
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TestClassDiscoverer.java
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Threads.java
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Todo.java
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Todos.java
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEConfiguration.java
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEInjectionEnricher.java
tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Zips.java
tomee/tomee/trunk/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/AppResourceProducer.java
tomee/tomee/trunk/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedRemoteExtension.java
tomee/tomee/trunk/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEConfiguration.java
tomee/tomee/trunk/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java
tomee/tomee/trunk/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEExtension.java
tomee/tomee/trunk/arquillian/arquillian-tomee-moviefun-example/src/main/java/org/superbiz/moviefun/ActionServlet.java
tomee/tomee/trunk/arquillian/arquillian-tomee-moviefun-example/src/main/java/org/superbiz/moviefun/Movie.java
tomee/tomee/trunk/arquillian/arquillian-tomee-moviefun-example/src/main/java/org/superbiz/moviefun/MovieController.java
tomee/tomee/trunk/arquillian/arquillian-tomee-moviefun-example/src/main/java/org/superbiz/moviefun/Movies.java
tomee/tomee/trunk/arquillian/arquillian-tomee-moviefun-example/src/main/java/org/superbiz/moviefun/MoviesImpl.java
tomee/tomee/trunk/arquillian/arquillian-tomee-moviefun-example/src/main/java/org/superbiz/moviefun/MoviesRemote.java
tomee/tomee/trunk/arquillian/arquillian-tomee-moviefun-example/src/main/java/org/superbiz/moviefun/SetupServlet.java
tomee/tomee/trunk/arquillian/arquillian-tomee-moviefun-example/src/main/java/org/superbiz/moviefun/setup/ExampleDataProducer.java
tomee/tomee/trunk/arquillian/arquillian-tomee-moviefun-example/src/main/java/org/superbiz/moviefun/setup/Examples.java
tomee/tomee/trunk/arquillian/arquillian-tomee-moviefun-example/src/main/java/org/superbiz/moviefun/setup/Setup.java
tomee/tomee/trunk/arquillian/arquillian-tomee-moviefun-example/src/main/java/org/superbiz/moviefun/util/JsfUtil.java
tomee/tomee/trunk/arquillian/arquillian-tomee-moviefun-example/src/main/java/org/superbiz/moviefun/util/PaginationHelper.java
tomee/tomee/trunk/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEConfiguration.java
tomee/tomee/trunk/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEContainer.java
tomee/tomee/trunk/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEEJBEnricherArchiveAppender.java
tomee/tomee/trunk/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEExtension.java
tomee/tomee/trunk/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEObserver.java
tomee/tomee/trunk/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEERemoteExtension.java
tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappConfiguration.java
tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java
tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappEJBEnricherArchiveAppender.java
tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappExtension.java
tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappObserver.java
tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappRemoteExtension.java
tomee/tomee/trunk/arquillian/ziplock/src/main/java/org/apache/ziplock/Archive.java
tomee/tomee/trunk/arquillian/ziplock/src/main/java/org/apache/ziplock/ClassLoaders.java
tomee/tomee/trunk/arquillian/ziplock/src/main/java/org/apache/ziplock/Files.java
tomee/tomee/trunk/arquillian/ziplock/src/main/java/org/apache/ziplock/IO.java
tomee/tomee/trunk/arquillian/ziplock/src/main/java/org/apache/ziplock/JarLocation.java
tomee/tomee/trunk/arquillian/ziplock/src/main/java/org/apache/ziplock/Join.java
tomee/tomee/trunk/arquillian/ziplock/src/main/java/org/apache/ziplock/ResourceFinder.java
tomee/tomee/trunk/arquillian/ziplock/src/main/java/org/apache/ziplock/WebModule.java
tomee/tomee/trunk/arquillian/ziplock/src/main/java/org/apache/ziplock/maven/Mvn.java
tomee/tomee/trunk/arquillian/ziplock/src/main/java/org/apache/ziplock/maven/PreloadableTestWar.java
tomee/tomee/trunk/arquillian/ziplock/src/main/java/org/apache/ziplock/maven/PreloadableWar.java
tomee/tomee/trunk/pom.xml
Modified: tomee/tomee/trunk/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/ArquillianUtil.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/ArquillianUtil.java?rev=1597233&r1=1597232&r2=1597233&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/ArquillianUtil.java (original)
+++ tomee/tomee/trunk/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/ArquillianUtil.java Sat May 24 01:49:45 2014
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -56,14 +56,14 @@ public final class ArquillianUtil {
if (properties.containsKey(ArquillianUtil.PREDEPLOYING_KEY)) {
final String toSplit = properties.getProperty(PREDEPLOYING_KEY).trim();
final ClassLoader loader = Thread.currentThread().getContextClassLoader();
- for (String name : toSplit.split(",")) {
- int bracket = name.indexOf(".[");
+ for (final String name : toSplit.split(",")) {
+ final int bracket = name.indexOf(".[");
if (bracket >= 0) {
- int end = name.indexOf("]");
+ final int end = name.indexOf("]");
if (end > bracket) {
final String pkg = name.substring(0, bracket + 1);
final String classes = name.substring(bracket + 2, end);
- for (String n : classes.split("\\|")) {
+ for (final String n : classes.split("\\|")) {
addClass(list, loader, pkg + n);
}
continue;
@@ -79,14 +79,14 @@ public final class ArquillianUtil {
final String name = classname.trim();
try {
final Class<?> clazz = loader.loadClass(name);
- for (Method m : clazz.getMethods()) {
+ for (final Method m : clazz.getMethods()) {
final int modifiers = m.getModifiers();
if (Object.class.equals(m.getDeclaringClass()) || !Archive.class.isAssignableFrom(m.getReturnType())
|| !Modifier.isStatic(modifiers) || !Modifier.isPublic(modifiers)) {
continue;
}
- for (Annotation a : m.getAnnotations()) {
+ for (final Annotation a : m.getAnnotations()) {
if ("org.jboss.arquillian.container.test.api.Deployment".equals(a.annotationType().getName())) {
final Archive<?> archive = (Archive<?>) m.invoke(null);
list.add(archive);
@@ -94,17 +94,17 @@ public final class ArquillianUtil {
}
}
}
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new OpenEJBRuntimeException(e);
}
}
- public static void undeploy(DeployableContainer<?> container, final Collection<Archive<?>> containerArchives) {
+ public static void undeploy(final DeployableContainer<?> container, final Collection<Archive<?>> containerArchives) {
if (containerArchives != null) {
- for (Archive<?> a : containerArchives) {
+ for (final Archive<?> a : containerArchives) {
try {
container.undeploy(a);
- } catch (DeploymentException e) {
+ } catch (final DeploymentException e) {
Logger.getLogger(container.getClass().getName()).log(Level.SEVERE, e.getMessage(), e);
}
}
Modified: tomee/tomee/trunk/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/deployment/DeploymentExceptionObserver.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/deployment/DeploymentExceptionObserver.java?rev=1597233&r1=1597232&r2=1597233&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/deployment/DeploymentExceptionObserver.java (original)
+++ tomee/tomee/trunk/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/deployment/DeploymentExceptionObserver.java Sat May 24 01:49:45 2014
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
Modified: tomee/tomee/trunk/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/deployment/DeploymentExceptionProvider.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/deployment/DeploymentExceptionProvider.java?rev=1597233&r1=1597232&r2=1597233&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/deployment/DeploymentExceptionProvider.java (original)
+++ tomee/tomee/trunk/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/deployment/DeploymentExceptionProvider.java Sat May 24 01:49:45 2014
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
Modified: tomee/tomee/trunk/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/enrichment/OpenEJBEnricher.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/enrichment/OpenEJBEnricher.java?rev=1597233&r1=1597232&r2=1597233&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/enrichment/OpenEJBEnricher.java (original)
+++ tomee/tomee/trunk/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/enrichment/OpenEJBEnricher.java Sat May 24 01:49:45 2014
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -70,7 +70,7 @@ public final class OpenEJBEnricher {
context.set(CreationalContext.class, cc);
}
OWBInjector.inject(bm, testInstance, cc);
- } catch (Throwable t) {
+ } catch (final Throwable t) {
LOGGER.log(Level.SEVERE, "Can't inject in " + testInstance.getClass(), t);
if (t instanceof RuntimeException) {
throw (RuntimeException) t;
@@ -83,12 +83,12 @@ public final class OpenEJBEnricher {
}
if (context != null) {
- ThreadContext callContext = new ThreadContext(context, null, Operation.INJECTION);
- ThreadContext oldContext = ThreadContext.enter(callContext);
+ final ThreadContext callContext = new ThreadContext(context, null, Operation.INJECTION);
+ final ThreadContext oldContext = ThreadContext.enter(callContext);
try {
final InjectionProcessor processor = new InjectionProcessor<Object>(testInstance, context.getInjections(), context.getJndiContext());
processor.createInstance();
- } catch (OpenEJBException e) {
+ } catch (final OpenEJBException e) {
// ignored
} finally {
ThreadContext.exit(oldContext);
Modified: tomee/tomee/trunk/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/mockito/MockitoEnricher.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/mockito/MockitoEnricher.java?rev=1597233&r1=1597232&r2=1597233&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/mockito/MockitoEnricher.java (original)
+++ tomee/tomee/trunk/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/mockito/MockitoEnricher.java Sat May 24 01:49:45 2014
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -32,7 +32,7 @@ public class MockitoEnricher implements
final Class<?> clazz = testCase.getClass().getClassLoader().loadClass(MOCKITO_CLASS);
final Method injectMethod = clazz.getMethod("initMocks", Object.class);
injectMethod.invoke(null, testCase);
- } catch (Exception e) {
+ } catch (final Exception e) {
// no-op: can't use mockito, not a big deal for common cases
}
}
Modified: tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBArchiveProcessor.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBArchiveProcessor.java?rev=1597233&r1=1597232&r2=1597233&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBArchiveProcessor.java (original)
+++ tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBArchiveProcessor.java Sat May 24 01:49:45 2014
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -110,7 +110,7 @@ public class OpenEJBArchiveProcessor {
} else if (FileAsset.class.isInstance(asset)) {
try {
additionalPaths.add(get(File.class, "file", asset).toURI().toURL());
- } catch (MalformedURLException e) {
+ } catch (final MalformedURLException e) {
LOGGER.log(Level.SEVERE, "can't add a library to the deployment", e);
}
} else if (ArchiveAsset.class.isInstance(asset)) {
@@ -171,7 +171,7 @@ public class OpenEJBArchiveProcessor {
if (ejbJarXml != null) {
try {
ejbJar = ReadDescriptors.readEjbJar(ejbJarXml.getAsset().openStream());
- } catch (OpenEJBException e) {
+ } catch (final OpenEJBException e) {
throw new OpenEJBRuntimeException(e);
}
} else {
@@ -218,7 +218,7 @@ public class OpenEJBArchiveProcessor {
} else if (FileAsset.class.isInstance(asset)) {
try {
appModule.getAltDDs().put(PERSISTENCE_XML, Arrays.asList(get(File.class, "file", asset).toURI().toURL()));
- } catch (MalformedURLException e) {
+ } catch (final MalformedURLException e) {
appModule.getAltDDs().put(PERSISTENCE_XML, Arrays.asList(new AssetSource(persistenceXml.getAsset())));
}
} else if (ClassLoaderAsset.class.isInstance(asset)) {
@@ -267,7 +267,7 @@ public class OpenEJBArchiveProcessor {
// do it for test class too
appModule.getEjbModules().iterator().next().getAltDDs().put(ENV_ENTRIES_PROPERTIES, properties);
- } catch (Exception e) {
+ } catch (final Exception e) {
LOGGER.log(Level.SEVERE, "can't read env-entries.properties", e);
} finally {
IO.close(is);
@@ -294,7 +294,7 @@ public class OpenEJBArchiveProcessor {
final Field field = asset.getClass().getDeclaredField(attr);
field.setAccessible(true);
return fileClass.cast(field.get(asset));
- } catch (Exception e) {
+ } catch (final Exception e) {
return null;
}
}
@@ -336,7 +336,7 @@ public class OpenEJBArchiveProcessor {
try {
final URL key = new URL("jar:file://!/WEB-INF/classes/"); // no host avoid host resolution in hashcode()
classesByUrl.put(key, mainClasses);
- } catch (MalformedURLException mue) {
+ } catch (final MalformedURLException mue) {
// no-op
}
}
@@ -358,7 +358,7 @@ public class OpenEJBArchiveProcessor {
return name.substring(1, name.length() - 6);
}
- private static class AssetSource implements ReadDescriptors.Source {
+ private static final class AssetSource implements ReadDescriptors.Source {
private Asset asset;
private AssetSource(final Asset asset) {
Modified: tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBConfiguration.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBConfiguration.java?rev=1597233&r1=1597232&r2=1597233&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBConfiguration.java (original)
+++ tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBConfiguration.java Sat May 24 01:49:45 2014
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -34,7 +34,7 @@ public class OpenEJBConfiguration implem
}
@Multiline
- public void setProperties(String properties) {
+ public void setProperties(final String properties) {
this.properties = properties;
}
Modified: tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBDeployableContainer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBDeployableContainer.java?rev=1597233&r1=1597232&r2=1597233&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBDeployableContainer.java (original)
+++ tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBDeployableContainer.java Sat May 24 01:49:45 2014
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -44,11 +44,9 @@ import org.jboss.arquillian.container.sp
import org.jboss.arquillian.container.spi.context.annotation.DeploymentScoped;
import org.jboss.arquillian.core.api.Instance;
import org.jboss.arquillian.core.api.InstanceProducer;
-import org.jboss.arquillian.core.api.annotation.ApplicationScoped;
import org.jboss.arquillian.core.api.annotation.Inject;
import org.jboss.arquillian.test.spi.TestClass;
import org.jboss.arquillian.test.spi.annotation.SuiteScoped;
-import org.jboss.arquillian.transaction.impl.configuration.TransactionConfiguration;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.descriptor.api.Descriptor;
@@ -79,7 +77,7 @@ public class OpenEJBDeployableContainer
try {
OpenEJBDeployableContainer.class.getClassLoader().loadClass("org.apache.openejb.server.ServiceManager");
PROPERTIES.setProperty(OpenEjbContainer.OPENEJB_EMBEDDED_REMOTABLE, "true");
- } catch (Exception e) {
+ } catch (final Exception e) {
// ignored
}
}
@@ -133,10 +131,6 @@ public class OpenEJBDeployableContainer
@Inject
private Instance<TestClass> testClass;
- @Inject
- @ApplicationScoped
- private InstanceProducer<TransactionConfiguration> txConfig;
-
@Override
public Class<OpenEJBConfiguration> getConfigurationClass() {
return OpenEJBConfiguration.class;
@@ -149,13 +143,13 @@ public class OpenEJBDeployableContainer
final ByteArrayInputStream bais = new ByteArrayInputStream(openEJBConfiguration.getProperties().getBytes());
try {
properties.load(bais);
- } catch (IOException e) {
+ } catch (final IOException e) {
throw new OpenEJBRuntimeException(e);
} finally {
IO.close(bais);
}
- for (Map.Entry<Object, Object> defaultKey : PROPERTIES.entrySet()) {
+ for (final Map.Entry<Object, Object> defaultKey : PROPERTIES.entrySet()) {
final String key = defaultKey.getKey().toString();
if (!properties.containsKey(key)) {
properties.setProperty(key, defaultKey.getValue().toString());
@@ -169,7 +163,7 @@ public class OpenEJBDeployableContainer
public void start() throws LifecycleException {
try {
initialContext = new InitialContext(properties);
- } catch (NamingException e) {
+ } catch (final NamingException e) {
throw new LifecycleException("can't start the OpenEJB container", e);
}
@@ -184,10 +178,10 @@ public class OpenEJBDeployableContainer
contextProducer.set(initialContext);
containerArchives = ArquillianUtil.toDeploy(properties);
- for (Archive<?> archive : containerArchives) {
+ for (final Archive<?> archive : containerArchives) {
try {
quickDeploy(archive, testClass.get());
- } catch (DeploymentException e) {
+ } catch (final DeploymentException e) {
Logger.getLogger(OpenEJBDeployableContainer.class.getName()).log(Level.SEVERE, e.getMessage(), e);
}
}
@@ -203,7 +197,7 @@ public class OpenEJBDeployableContainer
appInfoProducer.set(info.appInfo);
appContextProducer.set(info.appCtx);
classLoader.set(info.appCtx.getClassLoader());
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new DeploymentException("can't deploy " + archive.getName(), e);
}
@@ -229,7 +223,7 @@ public class OpenEJBDeployableContainer
startContexts(appCtx.getWebBeansContext().getContextsService(), appServletContext, appSession);
return new DeploymentInfo(appServletContext, appSession, appInfo, appCtx);
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new DeploymentException("can't deploy " + archive.getName(), e);
}
}
@@ -252,7 +246,7 @@ public class OpenEJBDeployableContainer
try {
assembler.destroyApplication(info.get().path);
stopContexts(appContext.get().getWebBeansContext().getContextsService(), servletContext.get(), session.get());
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new DeploymentException("can't undeploy " + archive.getName(), e);
}
}
@@ -265,7 +259,7 @@ public class OpenEJBDeployableContainer
if (initialContext != null) {
initialContext.close();
}
- } catch (NamingException e) {
+ } catch (final NamingException e) {
throw new LifecycleException("can't close the OpenEJB container", e);
} finally {
OpenEJB.destroy();
@@ -278,22 +272,22 @@ public class OpenEJBDeployableContainer
}
@Override
- public void deploy(Descriptor descriptor) throws DeploymentException {
+ public void deploy(final Descriptor descriptor) throws DeploymentException {
throw new UnsupportedOperationException();
}
@Override
- public void undeploy(Descriptor descriptor) throws DeploymentException {
+ public void undeploy(final Descriptor descriptor) throws DeploymentException {
throw new UnsupportedOperationException();
}
- private static class DeploymentInfo {
+ private static final class DeploymentInfo {
public final ServletContext appServletContext;
public final HttpSession appSession;
public final AppInfo appInfo;
public final AppContext appCtx;
- private DeploymentInfo(ServletContext appServletContext, HttpSession appSession, AppInfo appInfo, AppContext appCtx) {
+ private DeploymentInfo(final ServletContext appServletContext, final HttpSession appSession, final AppInfo appInfo, final AppContext appCtx) {
this.appServletContext = appServletContext;
this.appSession = appSession;
this.appInfo = appInfo;
Modified: tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBExtension.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBExtension.java?rev=1597233&r1=1597232&r2=1597233&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBExtension.java (original)
+++ tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBExtension.java Sat May 24 01:49:45 2014
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
Modified: tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBInjectionEnricher.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBInjectionEnricher.java?rev=1597233&r1=1597232&r2=1597233&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBInjectionEnricher.java (original)
+++ tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBInjectionEnricher.java Sat May 24 01:49:45 2014
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -30,7 +30,6 @@ import org.jboss.arquillian.test.spi.Tes
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.spi.AnnotatedType;
import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.InjectionTarget;
import java.lang.reflect.Method;
import java.util.List;
@@ -55,11 +54,11 @@ public class OpenEJBInjectionEnricher im
try {
final BeanManager bm = appContext.getWebBeansContext().getBeanManagerImpl();
final AnnotatedType<?> at = bm.createAnnotatedType(clazz);
- final InjectionTarget<Object> it = (InjectionTarget<Object>) bm.createInjectionTarget(at);
+ bm.createInjectionTarget(at);
final CreationalContext<Object> cc = bm.createCreationalContext(null);
OWBInjector.inject(bm, testInstance, cc);
cc.release();
- } catch (Exception e) {
+ } catch (final Exception e) {
// no-op
}
}
Modified: tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/SWClassLoader.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/SWClassLoader.java?rev=1597233&r1=1597232&r2=1597233&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/SWClassLoader.java (original)
+++ tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/SWClassLoader.java Sat May 24 01:49:45 2014
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -50,7 +50,7 @@ public class SWClassLoader extends Class
final Field handler = URL.class.getDeclaredField("handlers");
handler.setAccessible(true);
((Hashtable<String, URLStreamHandler>) handler.get(null)).put("archive", new ArchiveStreamHandler());
- } catch (Exception e) {
+ } catch (final Exception e) {
// no-op
}
}
@@ -99,7 +99,7 @@ public class SWClassLoader extends Class
if (node != null) {
try {
return new URL(null, "archive:" + archive.getName() + "/" + name, new ArchiveStreamHandler());
- } catch (MalformedURLException e) {
+ } catch (final MalformedURLException e) {
// no-op: let reuse parent method
}
}
@@ -168,7 +168,7 @@ public class SWClassLoader extends Class
private static String path(final String arName, final URL url) {
final String p = url.getPath();
- String out = p.substring(arName.length(), p.length());
+ final String out = p.substring(arName.length(), p.length());
if (prefixes.get(arName).endsWith("/") && out.startsWith("/")) {
return out.substring(1);
}
@@ -180,7 +180,7 @@ public class SWClassLoader extends Class
if (p == null) {
return null;
}
- int endIndex = p.indexOf('/');
+ final int endIndex = p.indexOf('/');
if (endIndex >= 0) {
return p.substring(0, endIndex);
}
@@ -190,10 +190,10 @@ public class SWClassLoader extends Class
public void close() {
ArchiveStreamHandler.reset(archive.getName());
- for (Closeable cl : closeables) {
+ for (final Closeable cl : closeables) {
try {
cl.close();
- } catch (IOException e) {
+ } catch (final IOException e) {
// no-op
}
}
Modified: tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/TestObserver.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/TestObserver.java?rev=1597233&r1=1597232&r2=1597233&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/TestObserver.java (original)
+++ tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/TestObserver.java Sat May 24 01:49:45 2014
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
Modified: tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/cucumber/ArchiveResourceIteratorFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/cucumber/ArchiveResourceIteratorFactory.java?rev=1597233&r1=1597232&r2=1597233&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/cucumber/ArchiveResourceIteratorFactory.java (original)
+++ tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/cucumber/ArchiveResourceIteratorFactory.java Sat May 24 01:49:45 2014
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -39,7 +39,7 @@ public class ArchiveResourceIteratorFact
}
@Override
- public Iterator<Resource> createIterator(URL url, String path, String suffix) {
+ public Iterator<Resource> createIterator(final URL url, final String path, final String suffix) {
return findResources(path, suffix).iterator();
}
@@ -92,7 +92,7 @@ public class ArchiveResourceIteratorFact
}
}
- private static String classloaderPath(ArchivePath key) {
+ private static String classloaderPath(final ArchivePath key) {
return key.get().replace("/WEB-INF/classes/", "");
}
}
Modified: tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/server/ServiceManagers.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/server/ServiceManagers.java?rev=1597233&r1=1597232&r2=1597233&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/server/ServiceManagers.java (original)
+++ tomee/tomee/trunk/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/server/ServiceManagers.java Sat May 24 01:49:45 2014
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
Modified: tomee/tomee/trunk/arquillian/arquillian-openejb-transaction-provider/src/main/java/org/apache/openejb/arquillian/transaction/OpenEJBTransactionProvider.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-openejb-transaction-provider/src/main/java/org/apache/openejb/arquillian/transaction/OpenEJBTransactionProvider.java?rev=1597233&r1=1597232&r2=1597233&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-openejb-transaction-provider/src/main/java/org/apache/openejb/arquillian/transaction/OpenEJBTransactionProvider.java (original)
+++ tomee/tomee/trunk/arquillian/arquillian-openejb-transaction-provider/src/main/java/org/apache/openejb/arquillian/transaction/OpenEJBTransactionProvider.java Sat May 24 01:49:45 2014
@@ -8,11 +8,11 @@
*
* http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.apache.openejb.arquillian.transaction;
@@ -30,7 +30,7 @@ public class OpenEJBTransactionProvider
public void beginTransaction(final TransactionalTest test) {
try {
lookup(test.getManager()).begin();
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new OpenEJBRuntimeException(e);
}
}
@@ -39,7 +39,7 @@ public class OpenEJBTransactionProvider
public void commitTransaction(final TransactionalTest test) {
try {
lookup(test.getManager()).commit();
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new OpenEJBRuntimeException(e);
}
}
@@ -48,7 +48,7 @@ public class OpenEJBTransactionProvider
public void rollbackTransaction(final TransactionalTest test) {
try {
lookup(test.getManager()).rollback();
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new OpenEJBRuntimeException(e);
}
}
Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ArquillianFilterRunner.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ArquillianFilterRunner.java?rev=1597233&r1=1597232&r2=1597233&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ArquillianFilterRunner.java (original)
+++ tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ArquillianFilterRunner.java Sat May 24 01:49:45 2014
@@ -8,11 +8,11 @@
*
* http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.apache.openejb.arquillian.common;
Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ArquillianRuntimeException.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ArquillianRuntimeException.java?rev=1597233&r1=1597232&r2=1597233&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ArquillianRuntimeException.java (original)
+++ tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ArquillianRuntimeException.java Sat May 24 01:49:45 2014
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -8,11 +8,11 @@
*
* http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.apache.openejb.arquillian.common;
Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/BeanDicovererInstaller.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/BeanDicovererInstaller.java?rev=1597233&r1=1597232&r2=1597233&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/BeanDicovererInstaller.java (original)
+++ tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/BeanDicovererInstaller.java Sat May 24 01:49:45 2014
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.openejb.arquillian.common;
import org.apache.openejb.config.AdditionalBeanDiscoverer;
Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ConfigurationOverrides.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ConfigurationOverrides.java?rev=1597233&r1=1597232&r2=1597233&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ConfigurationOverrides.java (original)
+++ tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ConfigurationOverrides.java Sat May 24 01:49:45 2014
@@ -8,11 +8,11 @@
*
* http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.apache.openejb.arquillian.common;
@@ -33,7 +33,7 @@ import java.util.logging.Logger;
public class ConfigurationOverrides {
protected static final Logger LOGGER = Logger.getLogger(TomEEContainer.class.getName());
- public static List<URL> apply(Object configuration, final Properties systemProperties, String... prefixes) {
+ public static List<URL> apply(final Object configuration, final Properties systemProperties, final String... prefixes) {
final List<URL> propertiesFiles = findPropertiesFiles("default.arquillian-%s.properties", prefixes);
if (!propertiesFiles.isEmpty()) {
apply(configuration, systemProperties, propertiesFiles, false, prefixes);
@@ -58,12 +58,12 @@ public class ConfigurationOverrides {
final Properties defaults = new Properties();
// Merge all the properties
- for (Properties p : propertiesList) {
+ for (final Properties p : propertiesList) {
defaults.putAll(p);
}
final ObjectMap map = new ObjectMap(configuration);
- for (Map.Entry<Object, Object> entry : defaults.entrySet()) {
+ for (final Map.Entry<Object, Object> entry : defaults.entrySet()) {
final String key = entry.getKey().toString();
final String value = entry.getValue().toString();
setProperty(map, key, key, value, Level.FINE, overrideNotNull);
@@ -72,8 +72,8 @@ public class ConfigurationOverrides {
//
// Override the config with system properties
//
- for (String key : map.keySet()) {
- for (String prefix : prefixes) {
+ for (final String key : map.keySet()) {
+ for (final String prefix : prefixes) {
final String property = prefix + "." + key;
final String value = systemProperties.getProperty(property);
@@ -82,12 +82,12 @@ public class ConfigurationOverrides {
}
}
- private static List<Properties> read(List<URL> urls) {
+ private static List<Properties> read(final List<URL> urls) {
final List<Properties> propertiesList = new ArrayList<Properties>();
- for (URL url : urls) {
+ for (final URL url : urls) {
try {
propertiesList.add(IO.readProperties(url));
- } catch (IOException e) {
+ } catch (final IOException e) {
LOGGER.log(Level.WARNING, "Cannot read : " + url, e);
}
}
@@ -99,7 +99,7 @@ public class ConfigurationOverrides {
final ClassLoader loader = Thread.currentThread().getContextClassLoader();
- for (String prefix : prefixes) {
+ for (final String prefix : prefixes) {
final String resourceName = String.format(name, prefix.replace('.', '-'));
addResources(urls, loader, resourceName);
}
@@ -107,18 +107,18 @@ public class ConfigurationOverrides {
return urls;
}
- private static void addResources(List<URL> urls, ClassLoader loader, String resourceName) {
+ private static void addResources(final List<URL> urls, final ClassLoader loader, final String resourceName) {
try {
final Enumeration<URL> resources = loader.getResources(resourceName);
while (resources.hasMoreElements()) {
urls.add(resources.nextElement());
}
- } catch (IOException e) {
+ } catch (final IOException e) {
LOGGER.log(Level.WARNING, "Failed getResources: " + resourceName, e);
}
}
- private static void setProperty(ObjectMap map, String key, String property, String value, final Level info, final boolean overrideNotNull) {
+ private static void setProperty(final ObjectMap map, final String key, final String property, final String value, final Level info, final boolean overrideNotNull) {
if (value == null) {
LOGGER.log(Level.FINE, String.format("Unset '%s'", property));
return;
@@ -132,13 +132,13 @@ public class ConfigurationOverrides {
try {
LOGGER.log(info, String.format("Applying override '%s=%s'", property, value));
map.put(key, value);
- } catch (Exception e) {
+ } catch (final Exception e) {
try {
map.put(key, Integer.parseInt(value)); // we manage String and int and boolean so let's try an int
- } catch (Exception ignored) {
+ } catch (final Exception ignored) {
try {
map.put(key, Boolean.parseBoolean(value)); // idem let's try a boolean
- } catch (Exception ignored2) {
+ } catch (final Exception ignored2) {
LOGGER.log(Level.WARNING, String.format("Override failed '%s=%s'", property, value), e);
}
}
Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/DownloadException.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/DownloadException.java?rev=1597233&r1=1597232&r2=1597233&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/DownloadException.java (original)
+++ tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/DownloadException.java Sat May 24 01:49:45 2014
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -8,30 +8,30 @@
*
* http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.apache.openejb.arquillian.common;
public class DownloadException extends Exception {
- public DownloadException() {
- }
+ public DownloadException() {
+ }
- public DownloadException(String message) {
- super(message);
- }
-
- public DownloadException(Throwable throwable) {
- super(throwable);
- }
-
- public DownloadException(String message, Throwable throwable) {
- super(message, throwable);
- }
+ public DownloadException(final String message) {
+ super(message);
+ }
+
+ public DownloadException(final Throwable throwable) {
+ super(throwable);
+ }
+
+ public DownloadException(final String message, final Throwable throwable) {
+ super(message, throwable);
+ }
}
Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Files.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Files.java?rev=1597233&r1=1597232&r2=1597233&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Files.java (original)
+++ tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Files.java Sat May 24 01:49:45 2014
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -8,11 +8,11 @@
*
* http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.apache.openejb.arquillian.common;
@@ -25,7 +25,7 @@ import java.util.logging.Logger;
/**
* @version $Rev: 1157006 $ $Date: 2011-08-12 01:23:04 -0700 (Fri, 12 Aug 2011) $
*/
-public class Files {
+public final class Files {
private static final Logger LOGGER = Logger.getLogger(Files.class.getName());
public static File path(final String... parts) {
@@ -57,7 +57,7 @@ public class Files {
File tempDir;
try {
tempDir = File.createTempFile(prefix, suffix);
- } catch (Throwable e) {
+ } catch (final Throwable e) {
final File tmp = new File("tmp");
if (!tmp.exists() && !tmp.mkdirs()) {
throw new IOException("Failed to create local tmp directory: " + tmp.getAbsolutePath());
@@ -124,7 +124,9 @@ public class Files {
}
public static void mkdir(final File dir) {
- if (dir.exists()) return;
+ if (dir.exists()) {
+ return;
+ }
if (!dir.mkdirs()) {
throw new IllegalStateException("cannot make directory: " + dir.getAbsolutePath());
}
Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/IO.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/IO.java?rev=1597233&r1=1597232&r2=1597233&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/IO.java (original)
+++ tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/IO.java Sat May 24 01:49:45 2014
@@ -8,11 +8,11 @@
*
* http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.apache.openejb.arquillian.common;
@@ -45,11 +45,11 @@ import java.util.zip.ZipOutputStream;
*/
public class IO {
- public static Properties readProperties(URL resource) throws IOException {
+ public static Properties readProperties(final URL resource) throws IOException {
return readProperties(resource, new Properties());
}
- public static Properties readProperties(URL resource, Properties properties) throws IOException {
+ public static Properties readProperties(final URL resource, final Properties properties) throws IOException {
return readProperties(read(resource), properties);
}
@@ -57,11 +57,11 @@ public class IO {
return readProperties(resource, new Properties());
}
- public static Properties readProperties(File resource, Properties properties) throws IOException {
+ public static Properties readProperties(final File resource, final Properties properties) throws IOException {
return readProperties(read(resource), properties);
}
- public static Properties writeProperties(File resource, Properties properties) throws IOException {
+ public static Properties writeProperties(final File resource, final Properties properties) throws IOException {
return writeProperties(write(resource), properties);
}
@@ -72,9 +72,13 @@ public class IO {
* @return
* @throws IOException
*/
- public static Properties readProperties(InputStream in, Properties properties) throws IOException {
- if (in == null) throw new NullPointerException("InputStream is null");
- if (properties == null) throw new NullPointerException("Properties is null");
+ public static Properties readProperties(final InputStream in, final Properties properties) throws IOException {
+ if (in == null) {
+ throw new NullPointerException("InputStream is null");
+ }
+ if (properties == null) {
+ throw new NullPointerException("Properties is null");
+ }
try {
properties.load(in);
} finally{
@@ -90,9 +94,13 @@ public class IO {
* @return
* @throws IOException
*/
- public static Properties writeProperties(OutputStream outputStream, Properties properties) throws IOException {
- if (outputStream == null) throw new NullPointerException("OutputStream is null");
- if (properties == null) throw new NullPointerException("Properties is null");
+ public static Properties writeProperties(final OutputStream outputStream, final Properties properties) throws IOException {
+ if (outputStream == null) {
+ throw new NullPointerException("OutputStream is null");
+ }
+ if (properties == null) {
+ throw new NullPointerException("Properties is null");
+ }
try {
properties.store(outputStream, "");
} finally{
@@ -102,41 +110,41 @@ public class IO {
}
- public static String readString(URL url) throws IOException {
+ public static String readString(final URL url) throws IOException {
final InputStream in = url.openStream();
try {
- BufferedReader reader = new BufferedReader(new InputStreamReader(in));
+ final BufferedReader reader = new BufferedReader(new InputStreamReader(in));
return reader.readLine();
} finally {
close(in);
}
}
- public static String readString(File file) throws IOException {
+ public static String readString(final File file) throws IOException {
final FileReader in = new FileReader(file);
try {
- BufferedReader reader = new BufferedReader(in);
+ final BufferedReader reader = new BufferedReader(in);
return reader.readLine();
} finally {
close(in);
}
}
- public static String slurp(String fileName) throws IOException {
+ public static String slurp(final String fileName) throws IOException {
return slurp(new File(fileName));
}
- public static byte[] slurpBytes(File file) throws IOException {
- ByteArrayOutputStream out = new ByteArrayOutputStream();
+ public static byte[] slurpBytes(final File file) throws IOException {
+ final ByteArrayOutputStream out = new ByteArrayOutputStream();
copy(file, out);
return out.toByteArray();
}
- public static String slurp(File file) throws IOException {
+ public static String slurp(final File file) throws IOException {
return new String(slurpBytes(file));
}
- public static String slurp(InputStream in) throws IOException {
+ public static String slurp(final InputStream in) throws IOException {
final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
int i = -1;
while ((i = in.read()) != -1) {
@@ -146,13 +154,13 @@ public class IO {
return new String(outputStream.toByteArray(), "UTF-8");
}
- public static String slurp(URL url) throws IOException {
- ByteArrayOutputStream out = new ByteArrayOutputStream();
+ public static String slurp(final URL url) throws IOException {
+ final ByteArrayOutputStream out = new ByteArrayOutputStream();
copy(url.openStream(), out);
return new String(out.toByteArray());
}
- public static void writeString(File file, String string) throws IOException {
+ public static void writeString(final File file, final String string) throws IOException {
final FileWriter out = new FileWriter(file);
try {
final BufferedWriter bufferedWriter = new BufferedWriter(out);
@@ -167,7 +175,7 @@ public class IO {
}
}
- public static void copy(File from, OutputStream to) throws IOException {
+ public static void copy(final File from, final OutputStream to) throws IOException {
final InputStream read = read(from);
try {
copy(read, to);
@@ -176,7 +184,7 @@ public class IO {
}
}
- public static void copy(InputStream from, File to) throws IOException {
+ public static void copy(final InputStream from, final File to) throws IOException {
final OutputStream write = write(to);
try {
copy(from, write);
@@ -185,7 +193,7 @@ public class IO {
}
}
- public static void copy(InputStream from, File to, boolean append) throws IOException {
+ public static void copy(final InputStream from, final File to, final boolean append) throws IOException {
final OutputStream write = write(to, append);
try {
copy(from, write);
@@ -194,8 +202,8 @@ public class IO {
}
}
- public static void copy(InputStream from, OutputStream to) throws IOException {
- byte[] buffer = new byte[1024];
+ public static void copy(final InputStream from, final OutputStream to) throws IOException {
+ final byte[] buffer = new byte[1024];
int length = 0;
while ((length = from.read(buffer)) != -1) {
to.write(buffer, 0, length);
@@ -203,26 +211,28 @@ public class IO {
to.flush();
}
- public static ZipOutputStream zip(File file) throws IOException {
+ public static ZipOutputStream zip(final File file) throws IOException {
final OutputStream write = write(file);
return new ZipOutputStream(write);
}
- public static ZipInputStream unzip(File file) throws IOException {
+ public static ZipInputStream unzip(final File file) throws IOException {
final InputStream read = read(file);
return new ZipInputStream(read);
}
- public static IOException close(Closeable closeable) throws IOException {
- if (closeable == null) return null;
+ public static IOException close(final Closeable closeable) throws IOException {
+ if (closeable == null) {
+ return null;
+ }
try {
if (closeable instanceof Flushable) {
((Flushable) closeable).flush();
}
- } catch (IOException e) {
+ } catch (final IOException e) {
try {
closeable.close();
- } catch (IOException e2) {
+ } catch (final IOException e2) {
// no-op
} finally {
return e;
@@ -230,7 +240,7 @@ public class IO {
}
try {
closeable.close();
- } catch (IOException e) {
+ } catch (final IOException e) {
return e;
}
return null;
@@ -246,24 +256,26 @@ public class IO {
}
}
- public static void copy(byte[] from, File to) throws IOException {
+ public static void copy(final byte[] from, final File to) throws IOException {
copy(new ByteArrayInputStream(from), to);
}
- public static void copy(byte[] from, OutputStream to) throws IOException {
+ public static void copy(final byte[] from, final OutputStream to) throws IOException {
copy(new ByteArrayInputStream(from), to);
}
public static void closeSilently(final Closeable closeable) {
try {
close(closeable);
- } catch (IOException e) {
+ } catch (final IOException e) {
// no-op
}
}
- public static boolean delete(File file) {
- if (file == null) return false;
+ public static boolean delete(final File file) {
+ if (file == null) {
+ return false;
+ }
if (!file.delete()) {
System.err.println("Delete failed " + file.getAbsolutePath());
return false;
@@ -272,26 +284,26 @@ public class IO {
return true;
}
- public static OutputStream write(File destination) throws FileNotFoundException {
+ public static OutputStream write(final File destination) throws FileNotFoundException {
final OutputStream out = new FileOutputStream(destination);
return new BufferedOutputStream(out, 32768);
}
- public static OutputStream write(File destination, boolean append) throws FileNotFoundException {
+ public static OutputStream write(final File destination, final boolean append) throws FileNotFoundException {
final OutputStream out = new FileOutputStream(destination, append);
return new BufferedOutputStream(out, 32768);
}
- public static InputStream read(File source) throws FileNotFoundException {
+ public static InputStream read(final File source) throws FileNotFoundException {
final InputStream in = new FileInputStream(source);
return new BufferedInputStream(in, 32768);
}
- public static InputStream read(byte[] content) {
+ public static InputStream read(final byte[] content) {
return new ByteArrayInputStream(content);
}
- public static InputStream read(URL url) throws IOException {
+ public static InputStream read(final URL url) throws IOException {
return url.openStream();
}
Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/MavenCache.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/MavenCache.java?rev=1597233&r1=1597232&r2=1597233&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/MavenCache.java (original)
+++ tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/MavenCache.java Sat May 24 01:49:45 2014
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -37,13 +37,13 @@ public class MavenCache {
// initializing the SystemInstance because we'll need it for configuration
try {
SystemInstance.get().init(new Properties());
- } catch (Exception e) {
+ } catch (final Exception e) {
// no-op
}
try {
return new File(ProvisioningUtil.realLocation(artifactInfo.startsWith("mvn") ? "" : "mvn:" + artifactInfo));
- } catch (Exception e) {
+ } catch (final Exception e) {
// ignored
}
try {
@@ -52,7 +52,7 @@ public class MavenCache {
// don't cache the fallback
// only main artifact should be cached
}
- } catch (Exception e1) {
+ } catch (final Exception e1) {
throw new IllegalStateException(e1);
}
@@ -67,7 +67,7 @@ public class MavenCache {
is = ProvisioningUtil.inputStreamTryingProxies(new URI(source));
try {
file = File.createTempFile("dload", ".fil");
- } catch (Throwable e) {
+ } catch (final Throwable e) {
final File tmp = new File("tmp");
if (!tmp.exists() && !tmp.mkdirs()) {
throw new IOException("Failed to create local tmp directory: " + tmp.getAbsolutePath());
@@ -83,13 +83,13 @@ public class MavenCache {
while ((bytesRead = is.read(buffer)) > -1) {
os.write(buffer, 0, bytesRead);
}
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new DownloadException("Unable to download " + source + " to " + file.getAbsolutePath(), e);
} finally {
if (is != null) {
try {
is.close();
- } catch (Exception e) {
+ } catch (final Exception e) {
// no-op
}
}
@@ -97,7 +97,7 @@ public class MavenCache {
if (os != null) {
try {
os.close();
- } catch (Exception e) {
+ } catch (final Exception e) {
// no-op
}
}
Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ObjectMap.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ObjectMap.java?rev=1597233&r1=1597232&r2=1597233&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ObjectMap.java (original)
+++ tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ObjectMap.java Sat May 24 01:49:45 2014
@@ -8,11 +8,11 @@
*
* http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.apache.openejb.arquillian.common;
@@ -35,28 +35,32 @@ public class ObjectMap extends AbstractM
private Map<String,Entry<String,Object>> attributes;
private Set<Entry<String,Object>> entries;
- public ObjectMap(Object object) {
+ public ObjectMap(final Object object) {
this(object.getClass(), object);
}
- public ObjectMap(Class clazz) {
+ public ObjectMap(final Class clazz) {
this(clazz, null);
}
- public ObjectMap(Class<?> clazz, Object object) {
+ public ObjectMap(final Class<?> clazz, final Object object) {
this.object = object;
attributes = new HashMap<String, Entry<String, Object>>();
- for (Field field : clazz.getFields()) {
+ for (final Field field : clazz.getFields()) {
final FieldEntry entry = new FieldEntry(field);
attributes.put(entry.getKey(), entry);
}
- for (Method getter : clazz.getMethods()) {
+ for (final Method getter : clazz.getMethods()) {
try {
- if (!getter.getName().startsWith("get")) continue;
- if (getter.getParameterTypes().length != 0) continue;
+ if (!getter.getName().startsWith("get")) {
+ continue;
+ }
+ if (getter.getParameterTypes().length != 0) {
+ continue;
+ }
final String name = getter.getName().replaceFirst("get", "set");
@@ -65,7 +69,8 @@ public class ObjectMap extends AbstractM
final MethodEntry entry = new MethodEntry(getter, setter);
attributes.put(entry.getKey(), entry);
- } catch (NoSuchMethodException e) {
+ } catch (final NoSuchMethodException e) {
+ // no-op
}
}
@@ -73,26 +78,30 @@ public class ObjectMap extends AbstractM
}
@Override
- public Object get(Object key) {
+ public Object get(final Object key) {
final Entry<String, Object> entry = attributes.get(key);
- if (entry == null) return null;
+ if (entry == null) {
+ return null;
+ }
return entry.getValue();
}
@Override
- public Object put(String key, Object value) {
+ public Object put(final String key, final Object value) {
final Entry<String, Object> entry = attributes.get(key);
- if (entry == null) return null;
+ if (entry == null) {
+ return null;
+ }
return entry.setValue(value);
}
@Override
- public boolean containsKey(Object key) {
+ public boolean containsKey(final Object key) {
return attributes.containsKey(key);
}
@Override
- public Object remove(Object key) {
+ public Object remove(final Object key) {
throw new UnsupportedOperationException();
}
@@ -105,7 +114,7 @@ public class ObjectMap extends AbstractM
private final Field field;
- public FieldEntry(Field field) {
+ public FieldEntry(final Field field) {
this.field = field;
}
@@ -118,18 +127,18 @@ public class ObjectMap extends AbstractM
public String getValue() {
try {
return (String) field.get(object);
- } catch (IllegalAccessException e) {
+ } catch (final IllegalAccessException e) {
throw new IllegalStateException(e);
}
}
@Override
- public Object setValue(Object value) {
+ public Object setValue(final Object value) {
try {
final Object replaced = getValue();
field.set(object, value);
return replaced;
- } catch (IllegalAccessException e) {
+ } catch (final IllegalAccessException e) {
throw new IllegalArgumentException(e);
}
}
@@ -140,8 +149,8 @@ public class ObjectMap extends AbstractM
private final Method getter;
private final Method setter;
- public MethodEntry(Method getter, Method setter) {
- StringBuilder name = new StringBuilder(getter.getName());
+ public MethodEntry(final Method getter, final Method setter) {
+ final StringBuilder name = new StringBuilder(getter.getName());
// remove 'set' or 'get'
name.delete(0, 3);
@@ -154,12 +163,12 @@ public class ObjectMap extends AbstractM
this.setter = setter;
}
- protected Object invoke(Method method, Object... args) {
+ protected Object invoke(final Method method, final Object... args) {
try {
return method.invoke(object, args);
- } catch (IllegalAccessException e) {
+ } catch (final IllegalAccessException e) {
throw new IllegalStateException(e);
- } catch (InvocationTargetException e) {
+ } catch (final InvocationTargetException e) {
throw new ArquillianRuntimeException(e.getCause());
}
}
@@ -175,7 +184,7 @@ public class ObjectMap extends AbstractM
}
@Override
- public Object setValue(Object value) {
+ public Object setValue(final Object value) {
final Object original = getValue();
invoke(setter, value);
return original;
Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Prefixes.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Prefixes.java?rev=1597233&r1=1597232&r2=1597233&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Prefixes.java (original)
+++ tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Prefixes.java Sat May 24 01:49:45 2014
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -8,11 +8,11 @@
*
* http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.apache.openejb.arquillian.common;
Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/RemoteInitialContextObserver.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/RemoteInitialContextObserver.java?rev=1597233&r1=1597232&r2=1597233&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/RemoteInitialContextObserver.java (original)
+++ tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/RemoteInitialContextObserver.java Sat May 24 01:49:45 2014
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -8,11 +8,11 @@
*
* http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.apache.openejb.arquillian.common;
@@ -65,7 +65,7 @@ public class RemoteInitialContextObserve
Context existing = null;
try {
existing = existingContext.get();
- } catch (Throwable t) {
+ } catch (final Throwable t) {
// no-op
}
@@ -85,7 +85,7 @@ public class RemoteInitialContextObserve
}
@Override
- public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+ public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable {
Exception err = null;
for (final Callable<Context> callable : Arrays.asList( // order is important to avoid to start an embedded container for some cases