Repository: tomee Updated Branches: refs/heads/tomee-1.7.x d151cf77a -> dec4431dd
Checkstyle Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/dec4431d Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/dec4431d Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/dec4431d Branch: refs/heads/tomee-1.7.x Commit: dec4431dd4810b107178874bef558149d225ad6a Parents: d151cf7 Author: AndyGee <[email protected]> Authored: Fri Feb 19 18:31:05 2016 +0100 Committer: AndyGee <[email protected]> Committed: Fri Feb 19 18:31:05 2016 +0100 ---------------------------------------------------------------------- .../org/apache/openejb/OpenEjbContainer.java | 2 +- .../openejb/assembler/classic/EjbResolver.java | 21 +- .../classic/InterceptorBindingBuilder.java | 4 +- .../assembler/classic/JndiEncBuilder.java | 2 +- .../assembler/classic/MethodInfoUtil.java | 4 +- .../assembler/classic/cmd/Info2Properties.java | 8 +- .../apache/openejb/config/SunConversion.java | 2 +- .../org/apache/openejb/core/BaseContext.java | 2 +- .../openejb/core/LocalInitialContext.java | 2 +- .../apache/openejb/core/TempClassLoader.java | 2 +- .../openejb/core/ivm/EjbHomeProxyHandler.java | 2 +- .../openejb/core/ivm/IntraVmCopyMonitor.java | 2 +- .../openejb/core/managed/ManagedContainer.java | 2 +- .../openejb/core/mdb/EndpointHandler.java | 2 +- .../core/security/jaas/SQLLoginModule.java | 2 +- .../core/stateful/StatefulContainer.java | 2 +- .../openejb/core/timer/EJBCronTrigger.java | 28 +- .../openejb/persistence/JtaEntityManager.java | 2 +- .../apache/openejb/util/ExecutorBuilder.java | 2 +- .../main/java/org/apache/openejb/util/Pool.java | 2 +- .../apache/openejb/util/proxy/QueryProxy.java | 2 +- .../assembler/classic/LinkResolverTest.java | 2 +- .../core/mdb/CustomMdbContainerTest.java | 2 +- .../openejb/core/mdb/JmsMdbContainerTest.java | 2 +- .../core/mdb/QuartzMdbContainerTest.java | 2 +- .../core/singleton/SingletonContainerTest.java | 2 +- .../core/stateful/CallbackOverridesTest.java | 2 +- .../openejb/core/stateful/Compat3to2Test.java | 2 +- .../core/stateful/StatefulContainerTest.java | 2 +- .../core/stateful/StatefulInterceptorTest.java | 2 +- .../stateful/StatefulInternalRemoveTest.java | 2 +- .../core/stateful/StatefulSessionBeanTest.java | 2 +- .../StatefulSessionSynchronizationTest.java | 2 +- .../stateless/CrossClassLoaderProxyTest.java | 2 +- .../core/stateless/JaxRpcInvocationTest.java | 2 +- .../core/stateless/JaxWsInvocationTest.java | 2 +- .../core/stateless/StatelessContainerTest.java | 2 +- .../StatelessInstanceManagerPoolingTest.java | 2 +- .../stateless/StatelessInterceptorTest.java | 2 +- .../stateless/StatelessMetaAnnotationTest.java | 2 +- .../org/apache/openejb/timer/ScheduleTest.java | 2 +- .../apache/openejb/timer/TimeoutAroundTest.java | 2 +- .../org/apache/openejb/util/OptionsTest.java | 2 +- .../util/proxy/LocalBeanProxyFactoryTest.java | 2 +- .../org/apache/openejb/util/test.properties | 274 +++++++++---------- .../org/apache/openejb/jee/EjbReference.java | 2 +- .../java/org/apache/openejb/jee/MethodIntf.java | 2 +- .../openejb/observer/ObserverManager.java | 2 +- .../java/org/superbiz/inheritance/Tower.java | 2 +- .../axis/assembler/JaxRpcOperationInfo.java | 2 +- .../axis/assembler/JaxRpcParameterInfo.java | 2 +- .../server/axis/assembler/JaxRpcTypeInfo.java | 2 +- .../apache/openejb/client/ClusterResponse.java | 2 +- .../org/apache/openejb/client/EJBResponse.java | 2 +- .../openejb/client/RequestMethodCode.java | 2 +- .../org/apache/openejb/client/RequestType.java | 2 +- .../org/apache/openejb/client/event/Log.java | 2 +- .../ejbd/ClientMulticastDiscoveryTest.java | 2 +- .../openejb/server/ejbd/FailoverTest.java | 2 +- .../openejb/server/httpd/HttpRequest.java | 2 +- .../openejb/server/httpd/OpenEJBHttpServer.java | 2 +- .../server/discovery/MultipointServer.java | 2 +- src/main/style/checkstyle.xml | 2 +- .../apache/openejb/tck/cdi/embedded/Report.java | 2 +- .../openejb/tck/cdi/tomee/embedded/Report.java | 2 +- .../apache/openejb/tck/cdi/tomee/Report.java | 2 +- 66 files changed, 229 insertions(+), 230 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java b/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java index ea84ed2..e127494 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java @@ -171,7 +171,7 @@ public final class OpenEjbContainer extends EJBContainer { lock.lock(); final Logger log = logger(); - + if (log.isDebugEnabled()) { final StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace(); for (final StackTraceElement element : stackTrace) { http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbResolver.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbResolver.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbResolver.java index 5d4be05..4261bfb 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbResolver.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbResolver.java @@ -46,19 +46,19 @@ public class EjbResolver { String getEjbLink(); } - public static enum Type { - UNKNOWN, LOCAL, REMOTE; + public enum Type { + UNKNOWN, LOCAL, REMOTE } - public static enum Scope { - GLOBAL, EAR, EJBJAR; + public enum Scope { + GLOBAL, EAR, EJBJAR } private final Map<String, EnterpriseBeanInfo> deployments = new TreeMap<String, EnterpriseBeanInfo>(); private final LinkResolver<String> resolver = new LinkResolver<String>(); private final Map<Interfaces, List<Interfaces>> interfaces = new TreeMap<Interfaces, List<Interfaces>>(); - private EjbResolver parent; + private final EjbResolver parent; private final Scope scope; @@ -191,7 +191,7 @@ public class EjbResolver { private List<Interfaces> filter(final List<Interfaces> list, final String name) { final String shortName = name.replaceAll(".*/", ""); - final List<Interfaces> matches = new ArrayList(); + final List<Interfaces> matches = new ArrayList<Interfaces>(); for (final Interfaces entry : list) { if (name.equalsIgnoreCase(entry.getId())) { matches.add(entry); @@ -203,7 +203,7 @@ public class EjbResolver { } private List<Interfaces> filter(final List<Interfaces> list, final Type type) { - final List<Interfaces> matches = new ArrayList(); + final List<Interfaces> matches = new ArrayList<Interfaces>(); for (final Interfaces entry : list) { if (type == Type.UNKNOWN || type == entry.type) { matches.add(entry); @@ -253,7 +253,7 @@ public class EjbResolver { private final String homeInterface; private final String objectInterface; - public Interfaces(final String objectInterface, final Type type, final String id) { + Interfaces(final String objectInterface, final Type type, final String id) { if (objectInterface == null) { throw new NullPointerException("objectInterface is null"); } @@ -263,7 +263,7 @@ public class EjbResolver { this.id = id; } - public Interfaces(String homeInterface, final String objectInterface, final Type type, final String id) { + Interfaces(String homeInterface, final String objectInterface, final Type type, final String id) { if (homeInterface == null) { homeInterface = "<none>"; } @@ -276,7 +276,7 @@ public class EjbResolver { this.id = id; } - public Interfaces(String homeInterface, final String objectInterface) { + Interfaces(String homeInterface, final String objectInterface) { if (homeInterface == null) { homeInterface = "<none>"; } @@ -317,6 +317,7 @@ public class EjbResolver { return result; } + @Override public int compareTo(final Object o) { if (this == o) { return 0; http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java index 7660cfc..b480375 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java @@ -44,11 +44,11 @@ public class InterceptorBindingBuilder { public static final Logger logger = Logger.getInstance(LogCategory.OPENEJB_STARTUP, InterceptorBindingBuilder.class.getPackage().getName()); private final List<InterceptorBindingInfo> packageAndClassBindings; - public static enum Level { + public enum Level { PACKAGE, ANNOTATION_CLASS, CLASS, ANNOTATION_METHOD, OVERLOADED_METHOD, EXACT_METHOD } - public static enum Type { + public enum Type { ADDITION_OR_LOWER_EXCLUSION, SAME_LEVEL_EXCLUSION, SAME_AND_LOWER_EXCLUSION, EXPLICIT_ORDERING } http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java index bf0eb60..daaa968 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java @@ -99,7 +99,7 @@ import java.util.concurrent.Callable; public class JndiEncBuilder { public static final Logger logger = Logger.getInstance(LogCategory.OPENEJB_STARTUP, JndiEncBuilder.class.getPackage().getName()); - public static enum JndiScope { + public enum JndiScope { comp, module, app, http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodInfoUtil.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodInfoUtil.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodInfoUtil.java index c284644..254acb5 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodInfoUtil.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodInfoUtil.java @@ -567,11 +567,11 @@ public class MethodInfoUtil { } - public static enum Level { + public enum Level { PACKAGE, BEAN, OVERLOADED_METHOD, EXACT_METHOD } - public static enum View { + public enum View { CLASS, ANY, INTERFACE; } http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/cmd/Info2Properties.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/cmd/Info2Properties.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/cmd/Info2Properties.java index 05fd946..cbba985 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/cmd/Info2Properties.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/cmd/Info2Properties.java @@ -52,7 +52,7 @@ import java.util.Properties; * @version $Rev$ $Date$ */ public class Info2Properties { - private static Messages messages = new Messages(Info2Properties.class); + private static final Messages messages = new Messages(Info2Properties.class); private static final String defaultServerUrl = "ejbd://localhost:4201"; @@ -308,10 +308,11 @@ public class Info2Properties { static class Filter extends FilterOutputStream { private boolean pastFirstLine; - public Filter(final OutputStream out) { + Filter(final OutputStream out) { super(out); } + @Override public void write(final int b) throws IOException { if (pastFirstLine) { super.write(b); @@ -324,10 +325,11 @@ public class Info2Properties { static class CommentsFilter extends FilterOutputStream { - public CommentsFilter(final OutputStream out) { + CommentsFilter(final OutputStream out) { super(out); } + @Override public void write(final int b) throws IOException { super.write(b); http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java b/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java index bbf9bad..3831480 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java @@ -1161,7 +1161,7 @@ public class SunConversion implements DynamicDeployer { } } - private static enum TokenType { + private enum TokenType { WHITESPACE, SYMBOL, NORMAL } http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/container/openejb-core/src/main/java/org/apache/openejb/core/BaseContext.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/BaseContext.java b/container/openejb-core/src/main/java/org/apache/openejb/core/BaseContext.java index f594e03..7abac19 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/core/BaseContext.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/core/BaseContext.java @@ -53,7 +53,7 @@ import java.util.Properties; */ public abstract class BaseContext implements EJBContext, Serializable { - public static enum Call { + public enum Call { getEJBObject, getEJBLocalObject, isCallerInRole, setRollbackOnly, getCallerPrincipal, getRollbackOnly, getTimerService, getUserTransaction, getBusinessObject, timerMethod, getInvokedBusinessInterface, UserTransactionMethod, getMessageContext, getPrimaryKey, getContextData } http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/container/openejb-core/src/main/java/org/apache/openejb/core/LocalInitialContext.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/LocalInitialContext.java b/container/openejb-core/src/main/java/org/apache/openejb/core/LocalInitialContext.java index 64a645c..67031c9 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/core/LocalInitialContext.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/core/LocalInitialContext.java @@ -60,7 +60,7 @@ public class LocalInitialContext extends ContextWrapper { private final Options options; private ServiceManagerProxy serviceManager; - public static enum Close { + public enum Close { LOGOUT, DESTROY } http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java b/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java index 6734a48..ea7df2b 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java @@ -221,7 +221,7 @@ public class TempClassLoader extends URLClassLoader { return this.skip.contains(Skip.ALL) || URLClassLoaderFirst.shouldSkip(name); } - public static enum Skip { + public enum Skip { NONE, ANNOTATIONS, ENUMS, ALL } http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbHomeProxyHandler.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbHomeProxyHandler.java b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbHomeProxyHandler.java index 074f58c..77118e4 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbHomeProxyHandler.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/EjbHomeProxyHandler.java @@ -64,7 +64,7 @@ public abstract class EjbHomeProxyHandler extends BaseEjbProxyHandler { private final Map<String, MethodType> dispatchTable; - private static enum MethodType { + private enum MethodType { CREATE, FIND, HOME_HANDLE, http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmCopyMonitor.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmCopyMonitor.java b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmCopyMonitor.java index 72c3aea..6408085 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmCopyMonitor.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/IntraVmCopyMonitor.java @@ -18,7 +18,7 @@ package org.apache.openejb.core.ivm; public final class IntraVmCopyMonitor { - public static enum State { + public enum State { NONE, COPY(true), CLASSLOADER_COPY(true), PASSIVATION; private final boolean copy; http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedContainer.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedContainer.java b/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedContainer.java index 2e9a544..a97f71e 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedContainer.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedContainer.java @@ -217,7 +217,7 @@ public class ManagedContainer implements RpcContainer { return methods; } - public static enum MethodType { + public enum MethodType { CREATE, REMOVE, BUSINESS http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointHandler.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointHandler.java b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointHandler.java index 1e6d44f..2e7ccf8 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointHandler.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointHandler.java @@ -31,7 +31,7 @@ import java.lang.reflect.Method; import java.util.Arrays; public class EndpointHandler implements InvocationHandler, MessageEndpoint { - private static enum State { + private enum State { /** * The handler has been initialized and is ready for invoation */ http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/SQLLoginModule.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/SQLLoginModule.java b/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/SQLLoginModule.java index aed5703..caa4187 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/SQLLoginModule.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/SQLLoginModule.java @@ -404,7 +404,7 @@ public class SQLLoginModule implements LoginModule { public final String name; - private Option(final String name) { + Option(final String name) { this.name = name; } http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java b/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java index c709ee5..cd556c3 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java @@ -245,7 +245,7 @@ public class StatefulContainer implements RpcContainer { return cache; } - public static enum MethodType { + public enum MethodType { CREATE, REMOVE, BUSINESS http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EJBCronTrigger.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EJBCronTrigger.java b/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EJBCronTrigger.java index b70cff6..f7ba116 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EJBCronTrigger.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EJBCronTrigger.java @@ -102,8 +102,8 @@ public class EJBCronTrigger extends CronTriggerImpl { private final FieldExpression[] expressions = new FieldExpression[7]; - private TimeZone timezone; - private String rawValue; + private final TimeZone timezone; + private final String rawValue; public EJBCronTrigger(final ScheduleExpression expr) throws ParseException { @@ -676,14 +676,14 @@ public class EJBCronTrigger extends CronTriggerImpl { return isDynamicRangeExpression; } - public RangeExpression(final int field, final int start, final int end, final int start2) { + RangeExpression(final int field, final int start, final int end, final int start2) { super(field); this.start = start; this.end = end; this.start2 = start2; } - public RangeExpression(final Matcher m, final int field) throws ParseException { + RangeExpression(final Matcher m, final int field) throws ParseException { super(field); @@ -921,9 +921,8 @@ public class EJBCronTrigger extends CronTriggerImpl { private final List<WeekdayExpression> weekDayExpressions = new ArrayList<WeekdayExpression>(); private final List<DaysFromLastDayExpression> daysFromLastDayExpressions = new ArrayList<DaysFromLastDayExpression>(); - ; - public ListExpression(final Matcher m, final int field) throws ParseException { + ListExpression(final Matcher m, final int field) throws ParseException { super(field); initialize(m); } @@ -938,13 +937,10 @@ public class EJBCronTrigger extends CronTriggerImpl { if (value.equals(LAST_IDENTIFIER)) { daysFromLastDayExpressions.add(new DaysFromLastDayExpression()); - continue; } else if (daysToLastMatcher.matches()) { daysFromLastDayExpressions.add(new DaysFromLastDayExpression(daysToLastMatcher)); - continue; } else if (weekDayMatcher.matches()) { weekDayExpressions.add(new WeekdayExpression(weekDayMatcher)); - continue; } else if (rangeMatcher.matches()) { final RangeExpression rangeExpression = new RangeExpression(rangeMatcher, field); @@ -1030,7 +1026,7 @@ public class EJBCronTrigger extends CronTriggerImpl { private final int start; private final int interval; - public IncrementExpression(final Matcher m, final int field) { + IncrementExpression(final Matcher m, final int field) { super(field); final int minValue = CALENDAR.getMinimum(field); start = m.group(1).equals("*") ? minValue : Integer.parseInt(m.group(1)); @@ -1057,7 +1053,7 @@ public class EJBCronTrigger extends CronTriggerImpl { } } else { - return new Integer(start); + return start; } return null; @@ -1084,7 +1080,7 @@ public class EJBCronTrigger extends CronTriggerImpl { } } else { - return new Integer(start); + return start; } return null; @@ -1096,7 +1092,7 @@ public class EJBCronTrigger extends CronTriggerImpl { private final Integer ordinal; // null means last private final int weekday; - public WeekdayExpression(final Matcher m) throws ParseException { + WeekdayExpression(final Matcher m) throws ParseException { super(Calendar.DAY_OF_MONTH); final Character firstChar = m.group(1).charAt(0); ordinal = Character.isDigit(firstChar) ? Integer.valueOf(firstChar.toString()) : null; @@ -1151,12 +1147,12 @@ public class EJBCronTrigger extends CronTriggerImpl { private final int days; - public DaysFromLastDayExpression(final Matcher m) { + DaysFromLastDayExpression(final Matcher m) { super(Calendar.DAY_OF_MONTH); days = new Integer(m.group(1)); } - public DaysFromLastDayExpression() { + DaysFromLastDayExpression() { super(Calendar.DAY_OF_MONTH); this.days = 0; } @@ -1181,7 +1177,7 @@ public class EJBCronTrigger extends CronTriggerImpl { private static class AsteriskExpression extends FieldExpression { - public AsteriskExpression(final int field) { + AsteriskExpression(final int field) { super(field); } http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaEntityManager.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaEntityManager.java b/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaEntityManager.java index 1dfb8b8..6371b9f 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaEntityManager.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaEntityManager.java @@ -646,7 +646,7 @@ public class JtaEntityManager implements EntityManager, Serializable { } } - private static enum Op { + private enum Op { clear, close, contains, createNamedQuery, createNativeQuery, createQuery, find, flush, getFlushMode, getReference, getTransaction, lock, merge, refresh, remove, setFlushMode, persist, detach, getLockMode, unwrap, setProperty, getCriteriaBuilder, getProperties, getMetamodel, joinTransaction, getDelegate; public Timer start(final JtaEntityManager em) { http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/container/openejb-core/src/main/java/org/apache/openejb/util/ExecutorBuilder.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/ExecutorBuilder.java b/container/openejb-core/src/main/java/org/apache/openejb/util/ExecutorBuilder.java index abff525..e033ebd 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/util/ExecutorBuilder.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/util/ExecutorBuilder.java @@ -127,7 +127,7 @@ public class ExecutorBuilder { /** * @version $Rev$ $Date$ */ - public static enum QueueType { + public enum QueueType { ARRAY, LINKED, PRIORITY, http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java b/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java index b1135ca..4ddd51e 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java @@ -777,7 +777,7 @@ public class Pool<T> { } - public static enum Event { + public enum Event { FULL, IDLE, AGED, FLUSHED, GC } http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/QueryProxy.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/QueryProxy.java b/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/QueryProxy.java index 042b039..d6121be 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/QueryProxy.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/QueryProxy.java @@ -65,7 +65,7 @@ public class QueryProxy implements InvocationHandler { private EntityManager em; - private static enum QueryType { + private enum QueryType { NAMED, NATIVE, OTHER } http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/LinkResolverTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/LinkResolverTest.java b/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/LinkResolverTest.java index e41e54d..e8b207b 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/LinkResolverTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/LinkResolverTest.java @@ -40,7 +40,7 @@ public class LinkResolverTest extends TestCase { assertEquals(Thing.TWO, resolver.resolveLink("../some/./other.jar#two", moduleUri)); } - private static enum Thing { + private enum Thing { ONE, TWO } } http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/CustomMdbContainerTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/CustomMdbContainerTest.java b/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/CustomMdbContainerTest.java index b85e24b..2fb2116 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/CustomMdbContainerTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/CustomMdbContainerTest.java @@ -115,7 +115,7 @@ public class CustomMdbContainerTest extends TestCase { } - public static enum Lifecycle { + public enum Lifecycle { CONSTRUCTOR, INJECTION, POST_CONSTRUCT, ON_MESSAGE } http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsMdbContainerTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsMdbContainerTest.java b/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsMdbContainerTest.java index ff83753..bd1fa94 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsMdbContainerTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsMdbContainerTest.java @@ -133,7 +133,7 @@ public class JmsMdbContainerTest extends TestCase { } } - public static enum Lifecycle { + public enum Lifecycle { CONSTRUCTOR, INJECTION, POST_CONSTRUCT, ON_MESSAGE } http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/QuartzMdbContainerTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/QuartzMdbContainerTest.java b/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/QuartzMdbContainerTest.java index e811eb8..14457ca 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/QuartzMdbContainerTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/QuartzMdbContainerTest.java @@ -107,7 +107,7 @@ public class QuartzMdbContainerTest extends TestCase { } - public static enum Lifecycle { + public enum Lifecycle { CONSTRUCTOR, INJECTION, POST_CONSTRUCT, ON_MESSAGE } http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/container/openejb-core/src/test/java/org/apache/openejb/core/singleton/SingletonContainerTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/core/singleton/SingletonContainerTest.java b/container/openejb-core/src/test/java/org/apache/openejb/core/singleton/SingletonContainerTest.java index 43cfcf8..2a3cf1c 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/core/singleton/SingletonContainerTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/core/singleton/SingletonContainerTest.java @@ -152,7 +152,7 @@ public class SingletonContainerTest extends TestCase { } - public static enum Lifecycle { + public enum Lifecycle { CONSTRUCTOR, INJECTION, POST_CONSTRUCT, BUSINESS_METHOD } http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/CallbackOverridesTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/CallbackOverridesTest.java b/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/CallbackOverridesTest.java index b5482d8..a729728 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/CallbackOverridesTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/CallbackOverridesTest.java @@ -83,7 +83,7 @@ public class CallbackOverridesTest extends TestCase { assertEquals(Collections.EMPTY_LIST, callbacks); } - public static enum Callback { + public enum Callback { POST_CONSTRUCT, PRE_PASSIVATE, POST_ACTIVATE, http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/Compat3to2Test.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/Compat3to2Test.java b/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/Compat3to2Test.java index 22f1596..fef733f 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/Compat3to2Test.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/Compat3to2Test.java @@ -104,7 +104,7 @@ public class Compat3to2Test extends TestCase { public static List<Call> calls = new ArrayList<Call>(); - public static enum Call { + public enum Call { // construction Constructor, PostConstruct, EjbCreate, EjbPassivate1, // business method http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulContainerTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulContainerTest.java b/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulContainerTest.java index cbc87ae..55f891e 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulContainerTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulContainerTest.java @@ -287,7 +287,7 @@ public class StatefulContainerTest extends TestCase { } - public static enum Lifecycle { + public enum Lifecycle { // construction CONSTRUCTOR, INJECTION, POST_CONSTRUCT, PRE_PASSIVATE1, // business method http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulInterceptorTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulInterceptorTest.java b/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulInterceptorTest.java index 8736381..fe0c0b6 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulInterceptorTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulInterceptorTest.java @@ -117,7 +117,7 @@ public class StatefulInterceptorTest extends TestCase { assertEquals(join("\n", expected), join("\n", calls)); } - public static enum Call { + public enum Call { Default_PostConstruct_BEFORE, Class_PostConstruct_BEFORE, Bean_PostConstruct, http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulInternalRemoveTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulInternalRemoveTest.java b/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulInternalRemoveTest.java index a325184..2c35192 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulInternalRemoveTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulInternalRemoveTest.java @@ -91,7 +91,7 @@ public class StatefulInternalRemoveTest extends TestCase { } - public static enum Lifecycle { + public enum Lifecycle { CONSTRUCTOR, POST_CONSTRUCT, BUSINESS_METHOD, http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulSessionBeanTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulSessionBeanTest.java b/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulSessionBeanTest.java index 51758c3..602e823 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulSessionBeanTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulSessionBeanTest.java @@ -105,7 +105,7 @@ public class StatefulSessionBeanTest extends TestCase { public static List<Call> calls = new ArrayList<Call>(); - public static enum Call { + public enum Call { // construction Constructor, SetSessionContext, EjbCreate, EjbPassivate1, // business method http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulSessionSynchronizationTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulSessionSynchronizationTest.java b/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulSessionSynchronizationTest.java index 0cfaecc..c03b930 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulSessionSynchronizationTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulSessionSynchronizationTest.java @@ -424,7 +424,7 @@ public class StatefulSessionSynchronizationTest extends TestCase { public static class SubBeanI extends BaseBeanB implements SessionSynchronization { } - public static enum Call { + public enum Call { BEAN_METHOD, BEAN_AROUND_INVOKE_BEGIN, BEAN_AROUND_INVOKE_AFTER, INTERCEPTOR_AROUND_INVOKE_BEGIN, INTERCEPTOR_AROUND_INVOKE_AFTER, BEAN_AFTER_BEGIN, BEAN_BEFORE_COMPLETION, BEAN_AFTER_COMPLETION, BAD_VALUE, INTERCEPTOR_AFTER_BEGIN, INTERCEPTOR_BEFORE_COMPLETION, INTERCEPTOR_AFTER_COMPLETION } } http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/CrossClassLoaderProxyTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/CrossClassLoaderProxyTest.java b/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/CrossClassLoaderProxyTest.java index b61953a..dd2c634 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/CrossClassLoaderProxyTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/CrossClassLoaderProxyTest.java @@ -278,7 +278,7 @@ public class CrossClassLoaderProxyTest extends TestCase { WidgetRemote create() throws CreateException, RemoteException; } - public static enum Lifecycle { + public enum Lifecycle { CONSTRUCTOR, POST_CONSTRUCT, BUSINESS_METHOD, PRE_DESTROY } http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/JaxRpcInvocationTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/JaxRpcInvocationTest.java b/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/JaxRpcInvocationTest.java index 875d904..2f3bcf7 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/JaxRpcInvocationTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/JaxRpcInvocationTest.java @@ -133,7 +133,7 @@ public class JaxRpcInvocationTest extends TestCase { assertEquals("Interceptor call stack", join("\n", expected), join("\n", calls)); } - public static enum Call { + public enum Call { WebServiceProvider_Invoke_BEFORE, EjbInterceptor_Invoke_BEFORE, Bean_Invoke_BEFORE, http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/JaxWsInvocationTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/JaxWsInvocationTest.java b/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/JaxWsInvocationTest.java index 95c0039..7fa6d77 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/JaxWsInvocationTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/JaxWsInvocationTest.java @@ -138,7 +138,7 @@ public class JaxWsInvocationTest extends TestCase { assertEquals(join("\n", expected), join("\n", calls)); } - public static enum Call { + public enum Call { WebServiceProvider_Invoke_BEFORE, EjbInterceptor_Invoke_BEFORE, Bean_Invoke_BEFORE, http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessContainerTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessContainerTest.java b/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessContainerTest.java index 74e873d..f436853 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessContainerTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessContainerTest.java @@ -132,7 +132,7 @@ public class StatelessContainerTest { } - public static enum Lifecycle { + public enum Lifecycle { CONSTRUCTOR, INJECTION, POST_CONSTRUCT, BUSINESS_METHOD, PRE_DESTROY } http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessInstanceManagerPoolingTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessInstanceManagerPoolingTest.java b/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessInstanceManagerPoolingTest.java index 1718087..cbdaa34 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessInstanceManagerPoolingTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessInstanceManagerPoolingTest.java @@ -254,7 +254,7 @@ public class StatelessInstanceManagerPoolingTest extends TestCase { } - public static enum Lifecycle { + public enum Lifecycle { CONSTRUCTOR, INJECTION, POST_CONSTRUCT, BUSINESS_METHOD, PRE_DESTROY } http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessInterceptorTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessInterceptorTest.java b/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessInterceptorTest.java index e907fb3..96f60d7 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessInterceptorTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessInterceptorTest.java @@ -197,7 +197,7 @@ public class StatelessInterceptorTest extends TestCase { assertEquals(join("\n", expected), join("\n", calls)); } - public static enum Call { + public enum Call { Default_PostConstruct_BEFORE, SuperClass_PostConstruct_BEFORE, Class_PostConstruct_BEFORE, http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessMetaAnnotationTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessMetaAnnotationTest.java b/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessMetaAnnotationTest.java index 62fe643..b69689e 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessMetaAnnotationTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessMetaAnnotationTest.java @@ -137,7 +137,7 @@ public class StatelessMetaAnnotationTest extends TestCase { } - public static enum Lifecycle { + public enum Lifecycle { CONSTRUCTOR, INJECTION, POST_CONSTRUCT, BUSINESS_METHOD, PRE_DESTROY } http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/container/openejb-core/src/test/java/org/apache/openejb/timer/ScheduleTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/timer/ScheduleTest.java b/container/openejb-core/src/test/java/org/apache/openejb/timer/ScheduleTest.java index adc9d65..b7be69d 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/timer/ScheduleTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/timer/ScheduleTest.java @@ -242,7 +242,7 @@ public class ScheduleTest extends TestCase { } } - public static enum Call { + public enum Call { BEAN_TIMEOUT, BEAN_BEFORE_AROUNDTIMEOUT, http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/container/openejb-core/src/test/java/org/apache/openejb/timer/TimeoutAroundTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/timer/TimeoutAroundTest.java b/container/openejb-core/src/test/java/org/apache/openejb/timer/TimeoutAroundTest.java index 22bae3b..e3c540c 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/timer/TimeoutAroundTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/timer/TimeoutAroundTest.java @@ -263,7 +263,7 @@ public class TimeoutAroundTest extends TestCase { } - public static enum Call { + public enum Call { BEAN_TIMEOUT, BEAN_BEFORE_AROUNDTIMEOUT, BEAN_AFTER_AROUNDTIMEOUT, BAD_VALUE, INTERCEPTOR_BEFORE_AROUNDTIMEOUT, INTERCEPTOR_AFTER_AROUNDTIMEOUT } http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/container/openejb-core/src/test/java/org/apache/openejb/util/OptionsTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/util/OptionsTest.java b/container/openejb-core/src/test/java/org/apache/openejb/util/OptionsTest.java index f3dd5d5..374efff 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/util/OptionsTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/util/OptionsTest.java @@ -208,7 +208,7 @@ public class OptionsTest extends TestCase { options.setLogger(log); } - public static enum Colors { + public enum Colors { RED, GREEN, BLUE; } http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/container/openejb-core/src/test/java/org/apache/openejb/util/proxy/LocalBeanProxyFactoryTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/util/proxy/LocalBeanProxyFactoryTest.java b/container/openejb-core/src/test/java/org/apache/openejb/util/proxy/LocalBeanProxyFactoryTest.java index 1570ea9..36210fd 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/util/proxy/LocalBeanProxyFactoryTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/util/proxy/LocalBeanProxyFactoryTest.java @@ -933,7 +933,7 @@ public class LocalBeanProxyFactoryTest extends TestCase { } } - public static enum Color { + public enum Color { RED, GREEN, BLUE; } http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/container/openejb-core/src/test/resources/org/apache/openejb/util/test.properties ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/resources/org/apache/openejb/util/test.properties b/container/openejb-core/src/test/resources/org/apache/openejb/util/test.properties index b7c25e5..1dc3389 100644 --- a/container/openejb-core/src/test/resources/org/apache/openejb/util/test.properties +++ b/container/openejb-core/src/test/resources/org/apache/openejb/util/test.properties @@ -17,187 +17,187 @@ # $Rev$ $Date$ # - # Determines wether or not this data source should be JTA managed - # or user managed. If set to 'true' it will automatically be enrolled - # in any ongoing transactions. Calling begin/commit/rollback or setAutoCommit - # on the datasource or connection will not be allowed. If you need to perform - # these functions yourself, set JtaManaged to 'false' - # - # In terms of JPA persistence.xml: - # "JtaManaged=true" can be used as a 'jta-data-source' - # "JtaManaged=false" can be used as a 'non-jta-data-source' +# Determines wether or not this data source should be JTA managed +# or user managed. If set to 'true' it will automatically be enrolled +# in any ongoing transactions. Calling begin/commit/rollback or setAutoCommit +# on the datasource or connection will not be allowed. If you need to perform +# these functions yourself, set JtaManaged to 'false' +# +# In terms of JPA persistence.xml: +# "JtaManaged=true" can be used as a 'jta-data-source' +# "JtaManaged=false" can be used as a 'non-jta-data-source' - JtaManaged = true +JtaManaged = true - # Driver class name +# Driver class name - JdbcDriver org.hsqldb.jdbcDriver +JdbcDriver org.hsqldb.jdbcDriver - # Url for creating connections +# Url for creating connections - JdbcUrl jdbc:hsqldb:file:data/hsqldb/hsqldb +JdbcUrl jdbc:hsqldb:file:data/hsqldb/hsqldb - # Default user name +# Default user name - UserName sa +UserName sa - # Default password +# Default password - Password +Password - # The connection properties that will be sent to the JDBC - # driver when establishing new connections - # - # Format of the string must be [propertyName=property;]* - # - # NOTE - The "user" and "password" properties will be passed - # explicitly, so they do not need to be included here. +# The connection properties that will be sent to the JDBC +# driver when establishing new connections +# +# Format of the string must be [propertyName=property;]* +# +# NOTE - The "user" and "password" properties will be passed +# explicitly, so they do not need to be included here. - ConnectionProperties +ConnectionProperties - # The default auto-commit state of new connections +# The default auto-commit state of new connections - DefaultAutoCommit true +DefaultAutoCommit true - # The default read-only state of new connections - # If not set then the setReadOnly method will not be called. - # (Some drivers don't support read only mode, ex: Informix) +# The default read-only state of new connections +# If not set then the setReadOnly method will not be called. +# (Some drivers don't support read only mode, ex: Informix) - DefaultReadOnly +DefaultReadOnly - # The default TransactionIsolation state of new connections - # If not set then the setTransactionIsolation method will not - # be called. The allowed values for this property are: - # NONE - # READ_COMMITTED - # READ_UNCOMMITTED - # REPEATABLE_READ - # SERIALIZABLE - # - # Note: Most JDBC drivers do not support all isolation levels +# The default TransactionIsolation state of new connections +# If not set then the setTransactionIsolation method will not +# be called. The allowed values for this property are: +# NONE +# READ_COMMITTED +# READ_UNCOMMITTED +# REPEATABLE_READ +# SERIALIZABLE +# +# Note: Most JDBC drivers do not support all isolation levels - DefaultTransactionIsolation +DefaultTransactionIsolation - # The initial number of connections that are created when the - # pool is started +# The initial number of connections that are created when the +# pool is started - InitialSize 0 +InitialSize 0 - # The maximum number of active connections that can be - # allocated from this pool at the same time, or a negative - # number for no limit. +# The maximum number of active connections that can be +# allocated from this pool at the same time, or a negative +# number for no limit. - MaxActive 20 +MaxActive 20 - # The maximum number of connections that can remain idle in - # the pool, without extra ones being released, or a negative - # number for no limit. +# The maximum number of connections that can remain idle in +# the pool, without extra ones being released, or a negative +# number for no limit. - MaxIdle 20 +MaxIdle 20 - # The minimum number of connections that can remain idle in - # the pool, without extra ones being created, or zero to - # create none. +# The minimum number of connections that can remain idle in +# the pool, without extra ones being created, or zero to +# create none. - MinIdle 0 +MinIdle 0 - # The maximum number of milliseconds that the pool will wait - # (when there are no available connections) for a connection - # to be returned before throwing an exception, or -1 to wait - # indefinitely. +# The maximum number of milliseconds that the pool will wait +# (when there are no available connections) for a connection +# to be returned before throwing an exception, or -1 to wait +# indefinitely. - MaxWait -1 +MaxWait -1 - # The SQL query that will be used to validate connections from - # this pool before returning them to the caller. If specified, - # this query MUST be an SQL SELECT statement that returns at - # least one row. +# The SQL query that will be used to validate connections from +# this pool before returning them to the caller. If specified, +# this query MUST be an SQL SELECT statement that returns at +# least one row. - ValidationQuery +ValidationQuery - # If true connections will be validated before being returned - # from the pool. If the validation fails, the connection is - # destroyed, and a new conection will be retrieved from the - # pool (and validated). - # - # NOTE - for a true value to have any effect, the - # ValidationQuery parameter must be set. +# If true connections will be validated before being returned +# from the pool. If the validation fails, the connection is +# destroyed, and a new conection will be retrieved from the +# pool (and validated). +# +# NOTE - for a true value to have any effect, the +# ValidationQuery parameter must be set. - TestOnBorrow true +TestOnBorrow true - # If true connections will be validated before being returned - # to the pool. If the validation fails, the connection is - # destroyed instead of being returned to the pool. - # - # NOTE - for a true value to have any effect, the - # ValidationQuery parameter must be set. +# If true connections will be validated before being returned +# to the pool. If the validation fails, the connection is +# destroyed instead of being returned to the pool. +# +# NOTE - for a true value to have any effect, the +# ValidationQuery parameter must be set. - TestOnReturn false +TestOnReturn false - # If true connections will be validated by the idle connection - # evictor (if any). If the validation fails, the connection is - # destroyed and removed from the pool - # - # NOTE - for a true value to have any effect, the - # timeBetweenEvictionRunsMillis property must be a positive - # number and the ValidationQuery parameter must be set. +# If true connections will be validated by the idle connection +# evictor (if any). If the validation fails, the connection is +# destroyed and removed from the pool +# +# NOTE - for a true value to have any effect, the +# timeBetweenEvictionRunsMillis property must be a positive +# number and the ValidationQuery parameter must be set. - TestWhileIdle false +TestWhileIdle false - # The number of milliseconds to sleep between runs of the idle - # connection evictor thread. When set to a negative number, no - # idle connection evictor thread will be run. +# The number of milliseconds to sleep between runs of the idle +# connection evictor thread. When set to a negative number, no +# idle connection evictor thread will be run. - TimeBetweenEvictionRunsMillis -1 +TimeBetweenEvictionRunsMillis -1 - # The number of connectionss to examine during each run of the - # idle connection evictor thread (if any). +# The number of connectionss to examine during each run of the +# idle connection evictor thread (if any). - NumTestsPerEvictionRun 3 +NumTestsPerEvictionRun 3 - # The minimum amount of time a connection may sit idle in the - # pool before it is eligable for eviction by the idle - # connection evictor (if any). +# The minimum amount of time a connection may sit idle in the +# pool before it is eligable for eviction by the idle +# connection evictor (if any). - MinEvictableIdleTimeMillis 1800000 +MinEvictableIdleTimeMillis 1800000 - # If true, a statement pool is created for each Connection and - # PreparedStatements created by one of the following methods are - # pooled: - # public PreparedStatement prepareStatement(String sql); - # public PreparedStatement prepareStatement(String sql, - # int resultSetType, - # int resultSetConcurrency) +# If true, a statement pool is created for each Connection and +# PreparedStatements created by one of the following methods are +# pooled: +# public PreparedStatement prepareStatement(String sql); +# public PreparedStatement prepareStatement(String sql, +# int resultSetType, +# int resultSetConcurrency) - PoolPreparedStatements false +PoolPreparedStatements false - # The maximum number of open statements that can be allocated - # from the statement pool at the same time, or zero for no - # limit. - # - # NOTE - Some drivers have limits on the number of open - # statements, so make sure there are some resources left - # for the other (non-prepared) statements. - - MaxOpenPreparedStatements 0 +# The maximum number of open statements that can be allocated +# from the statement pool at the same time, or zero for no +# limit. +# +# NOTE - Some drivers have limits on the number of open +# statements, so make sure there are some resources left +# for the other (non-prepared) statements. + +MaxOpenPreparedStatements 0 + +# If true the raw physical connection to the database can be +# accessed using the following construct: +# Connection conn = ds.getConnection(); +# Connection rawConn = ((DelegatingConnection) conn).getInnermostDelegate(); +# ... +# conn.close() +# +# Default is false, because misbehaving programs can do harmfull +# things to the raw connection shuch as closing the raw +# connection or continuing to use the raw connection after it +# has been assigned to another logical connection. Be carefull +# and only use when you need direct access to driver specific +# extentions. +# +# NOTE: Do NOT close the underlying connection, only the +# original logical connection wrapper. - # If true the raw physical connection to the database can be - # accessed using the following construct: - # Connection conn = ds.getConnection(); - # Connection rawConn = ((DelegatingConnection) conn).getInnermostDelegate(); - # ... - # conn.close() - # - # Default is false, because misbehaving programs can do harmfull - # things to the raw connection shuch as closing the raw - # connection or continuing to use the raw connection after it - # has been assigned to another logical connection. Be carefull - # and only use when you need direct access to driver specific - # extentions. - # - # NOTE: Do NOT close the underlying connection, only the - # original logical connection wrapper. - - AccessToUnderlyingConnectionAllowed false +AccessToUnderlyingConnectionAllowed false http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbReference.java ---------------------------------------------------------------------- diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbReference.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbReference.java index 90e7825..d2e6531 100644 --- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbReference.java +++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbReference.java @@ -35,7 +35,7 @@ public interface EjbReference extends JndiReference { Text[] getDescriptions(); - static enum Type { + enum Type { UNKNOWN, LOCAL, REMOTE; } } http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/container/openejb-jee/src/main/java/org/apache/openejb/jee/MethodIntf.java ---------------------------------------------------------------------- diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/MethodIntf.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/MethodIntf.java index b1a860b..527db01 100644 --- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/MethodIntf.java +++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/MethodIntf.java @@ -48,7 +48,7 @@ public enum MethodIntf { private final String name; - private MethodIntf(final String name) { + MethodIntf(final String name) { this.name = name; } http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/container/openejb-loader/src/main/java/org/apache/openejb/observer/ObserverManager.java ---------------------------------------------------------------------- diff --git a/container/openejb-loader/src/main/java/org/apache/openejb/observer/ObserverManager.java b/container/openejb-loader/src/main/java/org/apache/openejb/observer/ObserverManager.java index ded4e62..901d872 100644 --- a/container/openejb-loader/src/main/java/org/apache/openejb/observer/ObserverManager.java +++ b/container/openejb-loader/src/main/java/org/apache/openejb/observer/ObserverManager.java @@ -126,7 +126,7 @@ public class ObserverManager { return invocation; } - private static enum Phase { + private enum Phase { BEFORE, INVOKE, AFTER http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/examples/webservice-inheritance/src/main/java/org/superbiz/inheritance/Tower.java ---------------------------------------------------------------------- diff --git a/examples/webservice-inheritance/src/main/java/org/superbiz/inheritance/Tower.java b/examples/webservice-inheritance/src/main/java/org/superbiz/inheritance/Tower.java index 427f3c7..86404e0 100644 --- a/examples/webservice-inheritance/src/main/java/org/superbiz/inheritance/Tower.java +++ b/examples/webservice-inheritance/src/main/java/org/superbiz/inheritance/Tower.java @@ -24,7 +24,7 @@ public class Tower extends Item { private Fit fit; private String tubing; - public static enum Fit { + public enum Fit { Custom, Exact, Universal http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcOperationInfo.java ---------------------------------------------------------------------- diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcOperationInfo.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcOperationInfo.java index 580748a..e702d57 100644 --- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcOperationInfo.java +++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcOperationInfo.java @@ -38,7 +38,7 @@ public class JaxRpcOperationInfo { public Collection<JaxRpcFaultInfo> faults = new ArrayList<JaxRpcFaultInfo>(); - public static enum OperationStyle { + public enum OperationStyle { ONE_WAY, REQUEST_RESPONSE, SOLICIT_RESPONSE, NOTIFICATION } } http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcParameterInfo.java ---------------------------------------------------------------------- diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcParameterInfo.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcParameterInfo.java index 493c248..9ff73a4 100644 --- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcParameterInfo.java +++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcParameterInfo.java @@ -26,7 +26,7 @@ public class JaxRpcParameterInfo { public QName xmlType; public String javaType; - public static enum Mode { + public enum Mode { IN(true, false), OUT(false, true), INOUT(true, true); http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcTypeInfo.java ---------------------------------------------------------------------- diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcTypeInfo.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcTypeInfo.java index c64a090..a06a7de 100644 --- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcTypeInfo.java +++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcTypeInfo.java @@ -36,7 +36,7 @@ public class JaxRpcTypeInfo { public final Collection<JaxRpcFieldInfo> fields = new ArrayList<JaxRpcFieldInfo>(); - public static enum SerializerType { + public enum SerializerType { ARRAY, ENUM, LIST, OTHER } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/server/openejb-client/src/main/java/org/apache/openejb/client/ClusterResponse.java ---------------------------------------------------------------------- diff --git a/server/openejb-client/src/main/java/org/apache/openejb/client/ClusterResponse.java b/server/openejb-client/src/main/java/org/apache/openejb/client/ClusterResponse.java index 89519d2..22f463f 100644 --- a/server/openejb-client/src/main/java/org/apache/openejb/client/ClusterResponse.java +++ b/server/openejb-client/src/main/java/org/apache/openejb/client/ClusterResponse.java @@ -27,7 +27,7 @@ public class ClusterResponse implements Response { private static final long serialVersionUID = 5399831296584206574L; - public static enum Code { + public enum Code { CURRENT, UPDATE, FAILURE http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/server/openejb-client/src/main/java/org/apache/openejb/client/EJBResponse.java ---------------------------------------------------------------------- diff --git a/server/openejb-client/src/main/java/org/apache/openejb/client/EJBResponse.java b/server/openejb-client/src/main/java/org/apache/openejb/client/EJBResponse.java index 04c8c29..556f24a 100644 --- a/server/openejb-client/src/main/java/org/apache/openejb/client/EJBResponse.java +++ b/server/openejb-client/src/main/java/org/apache/openejb/client/EJBResponse.java @@ -197,7 +197,7 @@ public class EJBResponse implements ClusterableResponse { } } - public static enum Time { + public enum Time { TOTAL, CONTAINER, SERIALIZATION, http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/server/openejb-client/src/main/java/org/apache/openejb/client/RequestMethodCode.java ---------------------------------------------------------------------- diff --git a/server/openejb-client/src/main/java/org/apache/openejb/client/RequestMethodCode.java b/server/openejb-client/src/main/java/org/apache/openejb/client/RequestMethodCode.java index b8f8b73..57b9aeb 100644 --- a/server/openejb-client/src/main/java/org/apache/openejb/client/RequestMethodCode.java +++ b/server/openejb-client/src/main/java/org/apache/openejb/client/RequestMethodCode.java @@ -55,7 +55,7 @@ public enum RequestMethodCode { } } - private RequestMethodCode(final int code) { + RequestMethodCode(final int code) { this.code = code; } http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/server/openejb-client/src/main/java/org/apache/openejb/client/RequestType.java ---------------------------------------------------------------------- diff --git a/server/openejb-client/src/main/java/org/apache/openejb/client/RequestType.java b/server/openejb-client/src/main/java/org/apache/openejb/client/RequestType.java index 9293906..e8b8182 100644 --- a/server/openejb-client/src/main/java/org/apache/openejb/client/RequestType.java +++ b/server/openejb-client/src/main/java/org/apache/openejb/client/RequestType.java @@ -43,7 +43,7 @@ public enum RequestType { } } - private RequestType(final byte code) { + RequestType(final byte code) { this.code = code; } http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/server/openejb-client/src/main/java/org/apache/openejb/client/event/Log.java ---------------------------------------------------------------------- diff --git a/server/openejb-client/src/main/java/org/apache/openejb/client/event/Log.java b/server/openejb-client/src/main/java/org/apache/openejb/client/event/Log.java index d204f22..549763a 100644 --- a/server/openejb-client/src/main/java/org/apache/openejb/client/event/Log.java +++ b/server/openejb-client/src/main/java/org/apache/openejb/client/event/Log.java @@ -33,7 +33,7 @@ public @interface Log { Level value() default Level.INFO; - public static enum Level { + public enum Level { SEVERE, WARNING, INFO, http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/ClientMulticastDiscoveryTest.java ---------------------------------------------------------------------- diff --git a/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/ClientMulticastDiscoveryTest.java b/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/ClientMulticastDiscoveryTest.java index a48880b..c257abf 100644 --- a/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/ClientMulticastDiscoveryTest.java +++ b/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/ClientMulticastDiscoveryTest.java @@ -146,7 +146,7 @@ public class ClientMulticastDiscoveryTest extends TestCase { } - public static enum Host { + public enum Host { RED, BLUE, GREEN http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/FailoverTest.java ---------------------------------------------------------------------- diff --git a/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/FailoverTest.java b/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/FailoverTest.java index 634985e..62b51c9 100644 --- a/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/FailoverTest.java +++ b/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/FailoverTest.java @@ -217,7 +217,7 @@ public class FailoverTest extends TestCase { } - public static enum Host { + public enum Host { RED, BLUE, GREEN http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequest.java ---------------------------------------------------------------------- diff --git a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequest.java b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequest.java index 118d469..eb22ed2 100644 --- a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequest.java +++ b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequest.java @@ -31,7 +31,7 @@ public interface HttpRequest extends java.io.Serializable, HttpServletRequest { /** * Request methods */ - public static enum Method { + public enum Method { OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, CONNECT, PATCH, UNSUPPORTED } http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBHttpServer.java ---------------------------------------------------------------------- diff --git a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBHttpServer.java b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBHttpServer.java index 48c07f4..e0eb6f9 100644 --- a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBHttpServer.java +++ b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBHttpServer.java @@ -155,7 +155,7 @@ public class OpenEJBHttpServer implements HttpServer { } - public static enum Output { + public enum Output { REQUEST, RESPONSE } http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MultipointServer.java ---------------------------------------------------------------------- diff --git a/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MultipointServer.java b/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MultipointServer.java index f00e801..33369fd 100644 --- a/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MultipointServer.java +++ b/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MultipointServer.java @@ -502,7 +502,7 @@ public class MultipointServer { } } - private static enum State { + private enum State { OPEN, GREETING, LISTING, http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/src/main/style/checkstyle.xml ---------------------------------------------------------------------- diff --git a/src/main/style/checkstyle.xml b/src/main/style/checkstyle.xml index a1524f1..9dc30dd 100644 --- a/src/main/style/checkstyle.xml +++ b/src/main/style/checkstyle.xml @@ -116,7 +116,7 @@ <!-- Modifier Checks --> <!-- See http://checkstyle.sf.net/config_modifiers.html --> <module name="ModifierOrder"/> - <module name="RedundantModifier"/> + <!--<module name="RedundantModifier"/>--> <!-- Checks for blocks. You know, those {}'s --> http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/Report.java ---------------------------------------------------------------------- diff --git a/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/Report.java b/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/Report.java index 32528f6..736e5de 100644 --- a/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/Report.java +++ b/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/Report.java @@ -231,7 +231,7 @@ public class Report { } - public static enum Status { + public enum Status { PASS, FAIL, ERROR; } public static class TestResult implements Comparable<TestResult> { http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/Report.java ---------------------------------------------------------------------- diff --git a/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/Report.java b/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/Report.java index 17bc71e..3ed2b19 100644 --- a/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/Report.java +++ b/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/Report.java @@ -193,7 +193,7 @@ public class Report { } - public static enum Status { + public enum Status { PASS, FAIL, ERROR; } public static class TestResult { http://git-wip-us.apache.org/repos/asf/tomee/blob/dec4431d/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/Report.java ---------------------------------------------------------------------- diff --git a/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/Report.java b/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/Report.java index e8a2bd6..c7c237f 100644 --- a/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/Report.java +++ b/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/Report.java @@ -193,7 +193,7 @@ public class Report { } - public static enum Status { + public enum Status { PASS, FAIL, ERROR; } public static class TestResult {
