You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2014/09/07 17:19:05 UTC
svn commit: r1623052 - in
/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src:
main/java/org/apache/openejb/config/ main/java/org/apache/openejb/testing/
test/java/org/apache/openejb/config/rules/
Author: rmannibucau
Date: Sun Sep 7 15:19:04 2014
New Revision: 1623052
URL: http://svn.apache.org/r1623052
Log:
style + test
Modified:
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/config/FinderFactory.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckIncorrectPropertyNameTest.java
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java?rev=1623052&r1=1623051&r2=1623052&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java Sun Sep 7 15:19:04 2014
@@ -230,7 +230,6 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
@@ -300,11 +299,11 @@ public class AnnotationDeployer implemen
private static final Collection<String> API_CLASSES = new ArrayList<String>(WEB_CLASSES.length + JSF_CLASSES.length);
static {
- API_CLASSES.addAll(Arrays.asList(JSF_CLASSES));
- API_CLASSES.addAll(Arrays.asList(WEB_CLASSES));
+ API_CLASSES.addAll(asList(JSF_CLASSES));
+ API_CLASSES.addAll(asList(WEB_CLASSES));
}
- public static final Set<String> knownResourceEnvTypes = new TreeSet<String>(Arrays.asList(
+ public static final Set<String> knownResourceEnvTypes = new TreeSet<String>(asList(
"javax.ejb.EJBContext",
"javax.ejb.SessionContext",
"javax.ejb.EntityContext",
@@ -319,7 +318,7 @@ public class AnnotationDeployer implemen
"javax.validation.ValidatorFactory"
));
- public static final Set<String> knownEnvironmentEntries = new TreeSet<String>(Arrays.asList(
+ public static final Set<String> knownEnvironmentEntries = new TreeSet<String>(asList(
"boolean", "java.lang.Boolean",
"char", "java.lang.Character",
"byte", "java.lang.Byte",
@@ -813,7 +812,7 @@ public class AnnotationDeployer implemen
classLoader = Thread.currentThread().getContextClassLoader();
}
- final List<String> allowedTypes = Arrays.asList(new String[]{Boolean.class.getName(), String.class.getName(), Integer.class.getName(), Double.class.getName(), Byte.class.getName(), Short.class.getName(), Long.class.getName(), Float.class.getName(), Character.class.getName()});
+ final List<String> allowedTypes = asList(new String[]{Boolean.class.getName(), String.class.getName(), Integer.class.getName(), Double.class.getName(), Byte.class.getName(), Short.class.getName(), Long.class.getName(), Float.class.getName(), Character.class.getName()});
try {
final Class<?> clazz = classLoader.loadClass(realClassName(cls));
@@ -1731,7 +1730,7 @@ public class AnnotationDeployer implemen
}
private boolean isValidEjbAnnotationUsage(final Class annotationClass, final Annotated<Class<?>> beanClass, final String ejbName, final EjbModule ejbModule) {
- final List<Class<? extends Annotation>> annotations = new ArrayList(Arrays.asList(Singleton.class, Stateless.class, Stateful.class, MessageDriven.class));
+ final List<Class<? extends Annotation>> annotations = new ArrayList(asList(Singleton.class, Stateless.class, Stateful.class, MessageDriven.class));
annotations.remove(annotationClass);
final boolean b = true;
@@ -2922,7 +2921,7 @@ public class AnnotationDeployer implemen
all.local.addAll(xml.local);
all.remote.addAll(xml.remote);
- final List<Class<?>> classes = strict ? new ArrayList(Arrays.asList(beanClass)) : Classes.ancestors(beanClass);
+ final List<Class<?>> classes = strict ? new ArrayList(asList(beanClass)) : Classes.ancestors(beanClass);
for (final Class<?> clazz : classes) {
@@ -3009,10 +3008,10 @@ public class AnnotationDeployer implemen
*/
final BusinessInterfaces bean = new BusinessInterfaces();
if (local != null) {
- bean.local.addAll(Arrays.asList(local.value()));
+ bean.local.addAll(asList(local.value()));
}
if (remote != null) {
- bean.remote.addAll(Arrays.asList(remote.value()));
+ bean.remote.addAll(asList(remote.value()));
}
if (strict) {
@@ -3304,7 +3303,7 @@ public class AnnotationDeployer implemen
if (rolesAllowed != null) {
final MethodPermission methodPermission = new MethodPermission();
- methodPermission.getRoleName().addAll(Arrays.asList(rolesAllowed.value()));
+ methodPermission.getRoleName().addAll(asList(rolesAllowed.value()));
methodPermission.getMethod().add(new org.apache.openejb.jee.Method(ejbName, clazz.getName(), "*"));
assemblyDescriptor.getMethodPermission().add(methodPermission);
@@ -3370,7 +3369,7 @@ public class AnnotationDeployer implemen
checkConflictingSecurityAnnotations(method, ejbName, ejbModule, seen);
final RolesAllowed rolesAllowed = method.getAnnotation(RolesAllowed.class);
final MethodPermission methodPermission = new MethodPermission();
- methodPermission.getRoleName().addAll(Arrays.asList(rolesAllowed.value()));
+ methodPermission.getRoleName().addAll(asList(rolesAllowed.value()));
methodPermission.getMethod().add(new org.apache.openejb.jee.Method(ejbName, method.get()));
assemblyDescriptor.getMethodPermission().add(methodPermission);
@@ -3422,7 +3421,7 @@ public class AnnotationDeployer implemen
}
final List<String> annotations = new ArrayList<String>();
- for (final Class<? extends Annotation> annotation : Arrays.asList(RolesAllowed.class, PermitAll.class, DenyAll.class)) {
+ for (final Class<? extends Annotation> annotation : asList(RolesAllowed.class, PermitAll.class, DenyAll.class)) {
if (method.getAnnotation(annotation) != null) {
annotations.add("@" + annotation.getSimpleName());
}
@@ -3463,7 +3462,7 @@ public class AnnotationDeployer implemen
final Schedules schedulesAnnotation = method.getAnnotation(Schedules.class);
if (schedulesAnnotation != null) {
- scheduleAnnotationList.addAll(Arrays.asList(schedulesAnnotation.value()));
+ scheduleAnnotationList.addAll(asList(schedulesAnnotation.value()));
}
final Schedule scheduleAnnotation = method.getAnnotation(Schedule.class);
@@ -3666,7 +3665,7 @@ public class AnnotationDeployer implemen
final List<EJB> ejbList = new ArrayList<EJB>();
for (final Annotated<Class<?>> clazz : annotationFinder.findMetaAnnotatedClasses(EJBs.class)) {
final EJBs ejbs = clazz.getAnnotation(EJBs.class);
- ejbList.addAll(Arrays.asList(ejbs.value()));
+ ejbList.addAll(asList(ejbs.value()));
}
for (final Annotated<Class<?>> clazz : annotationFinder.findMetaAnnotatedClasses(EJB.class)) {
final EJB e = clazz.getAnnotation(EJB.class);
@@ -3700,7 +3699,7 @@ public class AnnotationDeployer implemen
final List<Resource> resourceList = new ArrayList<Resource>();
for (final Annotated<Class<?>> clazz : annotationFinder.findMetaAnnotatedClasses(Resources.class)) {
final Resources resources = clazz.getAnnotation(Resources.class);
- resourceList.addAll(Arrays.asList(resources.value()));
+ resourceList.addAll(asList(resources.value()));
}
for (final Annotated<Class<?>> clazz : annotationFinder.findMetaAnnotatedClasses(Resource.class)) {
final Resource resource = clazz.getAnnotation(Resource.class);
@@ -3742,7 +3741,7 @@ public class AnnotationDeployer implemen
final List<WebServiceRef> webservicerefList = new ArrayList<WebServiceRef>();
for (final Annotated<Class<?>> clazz : annotationFinder.findMetaAnnotatedClasses(WebServiceRefs.class)) {
final WebServiceRefs webServiceRefs = clazz.getAnnotation(WebServiceRefs.class);
- webservicerefList.addAll(Arrays.asList(webServiceRefs.value()));
+ webservicerefList.addAll(asList(webServiceRefs.value()));
}
for (final Annotated<Class<?>> clazz : annotationFinder.findMetaAnnotatedClasses(WebServiceRef.class)) {
final WebServiceRef webServiceRef = clazz.getAnnotation(WebServiceRef.class);
@@ -3779,7 +3778,7 @@ public class AnnotationDeployer implemen
final List<PersistenceUnit> persistenceUnitList = new ArrayList<PersistenceUnit>();
for (final Annotated<Class<?>> clazz : annotationFinder.findMetaAnnotatedClasses(PersistenceUnits.class)) {
final PersistenceUnits persistenceUnits = clazz.getAnnotation(PersistenceUnits.class);
- persistenceUnitList.addAll(Arrays.asList(persistenceUnits.value()));
+ persistenceUnitList.addAll(asList(persistenceUnits.value()));
}
for (final Annotated<Class<?>> clazz : annotationFinder.findMetaAnnotatedClasses(PersistenceUnit.class)) {
final PersistenceUnit persistenceUnit = clazz.getAnnotation(PersistenceUnit.class);
@@ -3807,7 +3806,7 @@ public class AnnotationDeployer implemen
final List<PersistenceContext> persistenceContextList = new ArrayList<PersistenceContext>();
for (final Annotated<Class<?>> clazz : annotationFinder.findMetaAnnotatedClasses(PersistenceContexts.class)) {
final PersistenceContexts persistenceContexts = clazz.getAnnotation(PersistenceContexts.class);
- persistenceContextList.addAll(Arrays.asList(persistenceContexts.value()));
+ persistenceContextList.addAll(asList(persistenceContexts.value()));
pcFactory.addAnnotations(clazz.get());
}
for (final Annotated<Class<?>> clazz : annotationFinder.findMetaAnnotatedClasses(PersistenceContext.class)) {
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java?rev=1623052&r1=1623051&r2=1623052&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java Sun Sep 7 15:19:04 2014
@@ -108,7 +108,7 @@ public class DeploymentLoader implements
private static final Collection<String> KNOWN_DESCRIPTORS = Arrays.asList("app-ctx.xml", "module.properties", "application.properties", "web.xml", "ejb-jar.xml", "openejb-jar.xml", "env-entries.properties", "beans.xml", "ra.xml", "application.xml", "application-client.xml", "persistence-fragment.xml", "persistence.xml", "validation.xml", NewLoaderLogic.EXCLUSION_FILE);
private static String ALTDD = SystemInstance.get().getOptions().get(OPENEJB_ALTDD_PREFIX, (String) null);
- private volatile List<URL> containerUrls = null;
+ private volatile List<URL> containerUrls;
public AppModule load(final File jarFile) throws OpenEJBException {
// verify we have a valid file
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/config/FinderFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/config/FinderFactory.java?rev=1623052&r1=1623051&r2=1623052&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/config/FinderFactory.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/config/FinderFactory.java Sun Sep 7 15:19:04 2014
@@ -126,7 +126,7 @@ public class FinderFactory {
return MODULE_LIMITED ? new ModuleLimitedFinder(finder) : finder;
}
- private OpenEJBAnnotationFinder fallbackAnnotationFinder(DeploymentModule module) {
+ private OpenEJBAnnotationFinder fallbackAnnotationFinder(final DeploymentModule module) {
final OpenEJBAnnotationFinder finder = new OpenEJBAnnotationFinder(new ClassesArchive(ensureMinimalClasses(module)));
finder.enableMetaAnnotations();
return finder;
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java?rev=1623052&r1=1623051&r2=1623052&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java Sun Sep 7 15:19:04 2014
@@ -797,7 +797,7 @@ public final class ApplicationComposers
final String[] value = jarsAnnotation.value();
final Collection<File> files = new ArrayList<File>(value.length);
for (final String v : value) {
- int size = files.size();
+ final int size = files.size();
for (final URL path : classpathAppsUrls) {
final File file = URLs.toFile(path);
if (file.getName().startsWith(v) && file.getName().endsWith(".jar")) {
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckIncorrectPropertyNameTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckIncorrectPropertyNameTest.java?rev=1623052&r1=1623051&r2=1623052&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckIncorrectPropertyNameTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckIncorrectPropertyNameTest.java Sun Sep 7 15:19:04 2014
@@ -34,9 +34,8 @@ public class CheckIncorrectPropertyNameT
//SystemInstance.get().setProperty("java.persistence.provider", "test");
SystemInstance.get().setProperty("javax.naming.referral", "test");
final EjbJar ejbJar = new EjbJar();
- ejbJar.addEnterpriseBean(new StatefulBean(org.apache.openejb.test.annotated.Green.class));
- final AppModule appModule = new AppModule(new EjbModule(ejbJar));
- return appModule;
+ ejbJar.addEnterpriseBean(new StatefulBean(Green.class));
+ return new AppModule(new EjbModule(ejbJar));
}
}