You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by tv...@apache.org on 2013/11/19 03:12:29 UTC
svn commit: r1543287 [6/9] - in
/tomee/tomee/trunk/container/openejb-core/src:
main/java/javax/xml/ws/wsaddressing/ main/java/org/apache/openejb/
main/java/org/apache/openejb/assembler/
main/java/org/apache/openejb/assembler/classic/ main/java/org/apac...
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/util/MathUtils.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/util/MathUtils.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/util/MathUtils.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/util/MathUtils.java Tue Nov 19 02:12:21 2013
@@ -17,12 +17,12 @@
package org.apache.openejb.math.util;
+import org.apache.openejb.math.MathRuntimeException;
+
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Arrays;
-import org.apache.openejb.math.MathRuntimeException;
-
/**
* Some useful additions to the built-in functions in {@link Math}.
* @version $Revision: 927249 $ $Date: 2010-03-24 18:06:51 -0700 (Wed, 24 Mar 2010) $
@@ -190,10 +190,10 @@ public final class MathUtils {
*/
public static long binomialCoefficient(final int n, final int k) {
checkBinomial(n, k);
- if ((n == k) || (k == 0)) {
+ if (n == k || k == 0) {
return 1;
}
- if ((k == 1) || (k == n - 1)) {
+ if (k == 1 || k == n - 1) {
return n;
}
// Use symmetry for large k
@@ -225,7 +225,7 @@ public final class MathUtils {
// is relative prime to (i/d) and is a divisor of
// result * (i/d).
final long d = gcd(i, j);
- result = (result / (j / d)) * (i / d);
+ result = result / (j / d) * i / d;
i++;
}
} else {
@@ -266,10 +266,10 @@ public final class MathUtils {
*/
public static double binomialCoefficientDouble(final int n, final int k) {
checkBinomial(n, k);
- if ((n == k) || (k == 0)) {
+ if (n == k || k == 0) {
return 1d;
}
- if ((k == 1) || (k == n - 1)) {
+ if (k == 1 || k == n - 1) {
return n;
}
if (k > n/2) {
@@ -307,10 +307,10 @@ public final class MathUtils {
*/
public static double binomialCoefficientLog(final int n, final int k) {
checkBinomial(n, k);
- if ((n == k) || (k == 0)) {
+ if (n == k || k == 0) {
return 0;
}
- if ((k == 1) || (k == n - 1)) {
+ if (k == 1 || k == n - 1) {
return Math.log(n);
}
@@ -411,7 +411,7 @@ public final class MathUtils {
* @return true if the values are equal or both are NaN
*/
public static boolean equals(double x, double y) {
- return (Double.isNaN(x) && Double.isNaN(y)) || x == y;
+ return Double.isNaN(x) && Double.isNaN(y) || x == y;
}
/**
@@ -427,7 +427,7 @@ public final class MathUtils {
* @return true if the values are equal or within range of each other
*/
public static boolean equals(double x, double y, double eps) {
- return equals(x, y) || (Math.abs(y - x) <= eps);
+ return equals(x, y) || Math.abs(y - x) <= eps;
}
/**
@@ -474,8 +474,8 @@ public final class MathUtils {
* @since 1.2
*/
public static boolean equals(double[] x, double[] y) {
- if ((x == null) || (y == null)) {
- return !((x == null) ^ (y == null));
+ if (x == null || y == null) {
+ return !(x == null ^ y == null);
}
if (x.length != y.length) {
return false;
@@ -616,8 +616,8 @@ public final class MathUtils {
public static int gcd(final int p, final int q) {
int u = p;
int v = q;
- if ((u == 0) || (v == 0)) {
- if ((u == Integer.MIN_VALUE) || (v == Integer.MIN_VALUE)) {
+ if (u == 0 || v == 0) {
+ if (u == Integer.MIN_VALUE || v == Integer.MIN_VALUE) {
throw MathRuntimeException.createArithmeticException(
"overflow: gcd({0}, {1}) is 2^31",
p, q);
@@ -650,7 +650,7 @@ public final class MathUtils {
}
// B2. Initialize: u and v have been divided by 2^k and at least
// one is odd.
- int t = ((u & 1) == 1) ? v : -(u / 2)/* B3 */;
+ int t = (u & 1) == 1 ? v : -(u / 2)/* B3 */;
// t negative: u was odd, v may be even (t replaces v)
// t positive: u was even, v is odd (t replaces u)
do {
@@ -705,8 +705,8 @@ public final class MathUtils {
public static long gcd(final long p, final long q) {
long u = p;
long v = q;
- if ((u == 0) || (v == 0)) {
- if ((u == Long.MIN_VALUE) || (v == Long.MIN_VALUE)){
+ if (u == 0 || v == 0) {
+ if (u == Long.MIN_VALUE || v == Long.MIN_VALUE){
throw MathRuntimeException.createArithmeticException(
"overflow: gcd({0}, {1}) is 2^63",
p, q);
@@ -739,7 +739,7 @@ public final class MathUtils {
}
// B2. Initialize: u and v have been divided by 2^k and at least
// one is odd.
- long t = ((u & 1) == 1) ? v : -(u / 2)/* B3 */;
+ long t = (u & 1) == 1 ? v : -(u / 2)/* B3 */;
// t negative: u was odd, v may be even (t replaces v)
// t positive: u was even, v is odd (t replaces u)
do {
@@ -791,7 +791,7 @@ public final class MathUtils {
* @return (byte)(+1) or (byte)(-1), depending on the sign of x
*/
public static byte indicator(final byte x) {
- return (x >= ZB) ? PB : NB;
+ return x >= ZB ? PB : NB;
}
/**
@@ -806,7 +806,7 @@ public final class MathUtils {
if (Double.isNaN(x)) {
return Double.NaN;
}
- return (x >= 0.0) ? 1.0 : -1.0;
+ return x >= 0.0 ? 1.0 : -1.0;
}
/**
@@ -820,7 +820,7 @@ public final class MathUtils {
if (Float.isNaN(x)) {
return Float.NaN;
}
- return (x >= 0.0F) ? 1.0F : -1.0F;
+ return x >= 0.0F ? 1.0F : -1.0F;
}
/**
@@ -830,7 +830,7 @@ public final class MathUtils {
* @return +1 or -1, depending on the sign of x
*/
public static int indicator(final int x) {
- return (x >= 0) ? 1 : -1;
+ return x >= 0 ? 1 : -1;
}
/**
@@ -840,7 +840,7 @@ public final class MathUtils {
* @return +1L or -1L, depending on the sign of x
*/
public static long indicator(final long x) {
- return (x >= 0L) ? 1L : -1L;
+ return x >= 0L ? 1L : -1L;
}
/**
@@ -851,7 +851,7 @@ public final class MathUtils {
* @return (short)(+1) or (short)(-1), depending on the sign of x
*/
public static short indicator(final short x) {
- return (x >= ZS) ? PS : NS;
+ return x >= ZS ? PS : NS;
}
/**
@@ -956,7 +956,7 @@ public final class MathUtils {
* @since 1.1
*/
public static int mulAndCheck(int x, int y) {
- long m = ((long)x) * ((long)y);
+ long m = (long)x * (long)y;
if (m < Integer.MIN_VALUE || m > Integer.MAX_VALUE) {
throw new ArithmeticException("overflow: mul");
}
@@ -1041,7 +1041,7 @@ public final class MathUtils {
if (Double.isNaN(d) || Double.isInfinite(d)) {
return d;
} else if (d == 0) {
- return (direction < 0) ? -Double.MIN_VALUE : Double.MIN_VALUE;
+ return direction < 0 ? -Double.MIN_VALUE : Double.MIN_VALUE;
}
// special cases MAX_VALUE to infinity and MIN_VALUE to 0
// are handled just as normal numbers
@@ -1056,20 +1056,20 @@ public final class MathUtils {
// we should increase the mantissa
if (mantissa == 0x000fffffffffffffL) {
return Double.longBitsToDouble(sign |
- (exponent + 0x0010000000000000L));
+ exponent + 0x0010000000000000L);
} else {
return Double.longBitsToDouble(sign |
- exponent | (mantissa + 1));
+ exponent | mantissa + 1);
}
} else {
// we should decrease the mantissa
if (mantissa == 0L) {
return Double.longBitsToDouble(sign |
- (exponent - 0x0010000000000000L) |
+ exponent - 0x0010000000000000L |
0x000fffffffffffffL);
} else {
return Double.longBitsToDouble(sign |
- exponent | (mantissa - 1));
+ exponent | mantissa - 1);
}
}
@@ -1087,7 +1087,7 @@ public final class MathUtils {
public static double scalb(final double d, final int scaleFactor) {
// handling of some important special cases
- if ((d == 0) || Double.isNaN(d) || Double.isInfinite(d)) {
+ if (d == 0 || Double.isNaN(d) || Double.isInfinite(d)) {
return d;
}
@@ -1097,7 +1097,7 @@ public final class MathUtils {
final long rest = bits & 0x800fffffffffffffL;
// shift the exponent
- final long newBits = rest | (exponent + (((long) scaleFactor) << 52));
+ final long newBits = rest | exponent + ((long) scaleFactor << 52);
return Double.longBitsToDouble(newBits);
}
@@ -1209,9 +1209,9 @@ public final class MathUtils {
*/
public static double round(double x, int scale, int roundingMethod) {
try {
- return (new BigDecimal
+ return new BigDecimal
(Double.toString(x))
- .setScale(scale, roundingMethod))
+ .setScale(scale, roundingMethod)
.doubleValue();
} catch (NumberFormatException ex) {
if (Double.isInfinite(x)) {
@@ -1358,7 +1358,7 @@ public final class MathUtils {
* @return (byte)(+1), (byte)(0), or (byte)(-1), depending on the sign of x
*/
public static byte sign(final byte x) {
- return (x == ZB) ? ZB : (x > ZB) ? PB : NB;
+ return x == ZB ? ZB : x > ZB ? PB : NB;
}
/**
@@ -1377,7 +1377,7 @@ public final class MathUtils {
if (Double.isNaN(x)) {
return Double.NaN;
}
- return (x == 0.0) ? 0.0 : (x > 0.0) ? 1.0 : -1.0;
+ return x == 0.0 ? 0.0 : x > 0.0 ? 1.0 : -1.0;
}
/**
@@ -1395,7 +1395,7 @@ public final class MathUtils {
if (Float.isNaN(x)) {
return Float.NaN;
}
- return (x == 0.0F) ? 0.0F : (x > 0.0F) ? 1.0F : -1.0F;
+ return x == 0.0F ? 0.0F : x > 0.0F ? 1.0F : -1.0F;
}
/**
@@ -1409,7 +1409,7 @@ public final class MathUtils {
* @return +1, 0, or -1, depending on the sign of x
*/
public static int sign(final int x) {
- return (x == 0) ? 0 : (x > 0) ? 1 : -1;
+ return x == 0 ? 0 : x > 0 ? 1 : -1;
}
/**
@@ -1423,7 +1423,7 @@ public final class MathUtils {
* @return +1L, 0L, or -1L, depending on the sign of x
*/
public static long sign(final long x) {
- return (x == 0L) ? 0L : (x > 0L) ? 1L : -1L;
+ return x == 0L ? 0L : x > 0L ? 1L : -1L;
}
/**
@@ -1438,7 +1438,7 @@ public final class MathUtils {
* x
*/
public static short sign(final short x) {
- return (x == ZS) ? ZS : (x > ZS) ? PS : NS;
+ return x == ZS ? ZS : x > ZS ? PS : NS;
}
/**
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/util/ResizableDoubleArray.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/util/ResizableDoubleArray.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/util/ResizableDoubleArray.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/util/ResizableDoubleArray.java Tue Nov 19 02:12:21 2013
@@ -16,11 +16,11 @@
*/
package org.apache.openejb.math.util;
+import org.apache.openejb.math.MathRuntimeException;
+
import java.io.Serializable;
import java.util.Arrays;
-import org.apache.openejb.math.MathRuntimeException;
-
/**
* <p>
* A variable length {@link DoubleArray} implementation that automatically
@@ -265,10 +265,10 @@ public class ResizableDoubleArray implem
*/
public synchronized void addElement(double value) {
numElements++;
- if ((startIndex + numElements) > internalArray.length) {
+ if (startIndex + numElements > internalArray.length) {
expand();
}
- internalArray[startIndex + (numElements - 1)] = value;
+ internalArray[startIndex + numElements - 1] = value;
if (shouldContract()) {
contract();
}
@@ -293,14 +293,14 @@ public class ResizableDoubleArray implem
public synchronized double addElementRolling(double value) {
double discarded = internalArray[startIndex];
- if ((startIndex + (numElements + 1)) > internalArray.length) {
+ if (startIndex + numElements + 1 > internalArray.length) {
expand();
}
// Increment the start index
startIndex += 1;
// Add the new value
- internalArray[startIndex + (numElements - 1)] = value;
+ internalArray[startIndex + numElements - 1] = value;
// Check the contraction criteria
if (shouldContract()) {
@@ -324,9 +324,9 @@ public class ResizableDoubleArray implem
"cannot substitute an element from an empty array");
}
- double discarded = internalArray[startIndex + (numElements - 1)];
+ double discarded = internalArray[startIndex + numElements - 1];
- internalArray[startIndex + (numElements - 1)] = value;
+ internalArray[startIndex + numElements - 1] = value;
return discarded;
}
@@ -674,8 +674,8 @@ public class ResizableDoubleArray implem
if (index + 1 > numElements) {
numElements = index + 1;
}
- if ((startIndex + index) >= internalArray.length) {
- expandTo(startIndex + (index + 1));
+ if (startIndex + index >= internalArray.length) {
+ expandTo(startIndex + index + 1);
}
internalArray[startIndex + index] = value;
}
@@ -757,7 +757,7 @@ public class ResizableDoubleArray implem
// Test the new num elements, check to see if the array needs to be
// expanded to accommodate this new number of elements
- if ((startIndex + i) > internalArray.length) {
+ if (startIndex + i > internalArray.length) {
expandTo(startIndex + i);
}
@@ -773,9 +773,9 @@ public class ResizableDoubleArray implem
*/
private synchronized boolean shouldContract() {
if (expansionMode == MULTIPLICATIVE_MODE) {
- return (internalArray.length / ((float) numElements)) > contractionCriteria;
+ return internalArray.length / (float) numElements > contractionCriteria;
} else {
- return (internalArray.length - numElements) > contractionCriteria;
+ return internalArray.length - numElements > contractionCriteria;
}
}
@@ -859,12 +859,12 @@ public class ResizableDoubleArray implem
synchronized(object) {
boolean result = true;
ResizableDoubleArray other = (ResizableDoubleArray) object;
- result = result && (other.initialCapacity == initialCapacity);
- result = result && (other.contractionCriteria == contractionCriteria);
- result = result && (other.expansionFactor == expansionFactor);
- result = result && (other.expansionMode == expansionMode);
- result = result && (other.numElements == numElements);
- result = result && (other.startIndex == startIndex);
+ result = result && other.initialCapacity == initialCapacity;
+ result = result && other.contractionCriteria == contractionCriteria;
+ result = result && other.expansionFactor == expansionFactor;
+ result = result && other.expansionMode == expansionMode;
+ result = result && other.numElements == numElements;
+ result = result && other.startIndex == startIndex;
if (!result) {
return false;
} else {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/mgmt/MEJBBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/mgmt/MEJBBean.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/mgmt/MEJBBean.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/mgmt/MEJBBean.java Tue Nov 19 02:12:21 2013
@@ -16,9 +16,6 @@
*/
package org.apache.openejb.mgmt;
-import java.util.List;
-import java.util.Set;
-
import javax.ejb.RemoteHome;
import javax.ejb.Stateless;
import javax.management.Attribute;
@@ -36,6 +33,8 @@ import javax.management.QueryExp;
import javax.management.ReflectionException;
import javax.management.j2ee.ListenerRegistration;
import javax.management.j2ee.ManagementHome;
+import java.util.List;
+import java.util.Set;
@Stateless(name = "MEJB")
@RemoteHome(ManagementHome.class)
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/monitoring/DynamicMBeanWrapper.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/monitoring/DynamicMBeanWrapper.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/monitoring/DynamicMBeanWrapper.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/monitoring/DynamicMBeanWrapper.java Tue Nov 19 02:12:21 2013
@@ -138,8 +138,8 @@ public class DynamicMBeanWrapper impleme
if (findAnnotation(m, ManagedAttribute.class) != null) {
String methodName = m.getName();
String attrName = methodName;
- if (((attrName.startsWith("get") && m.getParameterTypes().length == 0)
- || (attrName.startsWith("set") && m.getParameterTypes().length == 1))
+ if ((attrName.startsWith("get") && m.getParameterTypes().length == 0
+ || attrName.startsWith("set") && m.getParameterTypes().length == 1)
&& attrName.length() > 3) {
attrName = attrName.substring(3);
if (attrName.length() > 1) {
@@ -248,7 +248,7 @@ public class DynamicMBeanWrapper impleme
final Annotation[][] annots) {
final MBeanParameterInfo[] params =
new MBeanParameterInfo[classes.length];
- assert(classes.length == annots.length);
+ assert classes.length == annots.length;
String desc = "";
for (int i = 0; i < classes.length; i++) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/monitoring/Event.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/monitoring/Event.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/monitoring/Event.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/monitoring/Event.java Tue Nov 19 02:12:21 2013
@@ -19,11 +19,10 @@ package org.apache.openejb.monitoring;
//import org.apache.commons.math.stat.descriptive.SynchronizedDescriptiveStatistics;
//import org.apache.commons.math.stat.descriptive.DescriptiveStatistics;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.TimeUnit;
-import java.util.Date;
-import java.text.SimpleDateFormat;
import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.concurrent.atomic.AtomicLong;
/**
* @version $Rev$ $Date$
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/monitoring/ManagedMBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/monitoring/ManagedMBean.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/monitoring/ManagedMBean.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/monitoring/ManagedMBean.java Tue Nov 19 02:12:21 2013
@@ -28,16 +28,16 @@ import javax.management.InvalidAttribute
import javax.management.MBeanAttributeInfo;
import javax.management.MBeanConstructorInfo;
import javax.management.MBeanException;
+import javax.management.MBeanFeatureInfo;
import javax.management.MBeanInfo;
import javax.management.MBeanNotificationInfo;
import javax.management.MBeanOperationInfo;
import javax.management.MBeanParameterInfo;
import javax.management.ReflectionException;
-import javax.management.MBeanFeatureInfo;
+import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.lang.annotation.Annotation;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -46,8 +46,8 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReference;
import java.util.regex.Pattern;
@@ -209,7 +209,7 @@ public class ManagedMBean implements Dyn
for (int i = 0; i < method.getParameterTypes().length; i++) {
Object value = args[i];
Class<?> expectedType = method.getParameterTypes()[i];
- if (value instanceof String && (expectedType != Object.class)) {
+ if (value instanceof String && expectedType != Object.class) {
String stringValue = (String) value;
value = PropertyEditors.getValue(expectedType, stringValue);
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/monitoring/StatsInterceptor.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/monitoring/StatsInterceptor.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/monitoring/StatsInterceptor.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/monitoring/StatsInterceptor.java Tue Nov 19 02:12:21 2013
@@ -216,7 +216,7 @@ public class StatsInterceptor {
public Stats(Method method, Monitor classAnnotation) {
Monitor methodAnnotation = method.getAnnotation(Monitor.class);
- int window = (methodAnnotation != null) ? methodAnnotation.sample() : (classAnnotation != null) ? classAnnotation.sample() : 2000;
+ int window = methodAnnotation != null ? methodAnnotation.sample() : classAnnotation != null ? classAnnotation.sample() : 2000;
this.samples = new SynchronizedDescriptiveStatistics(window);
String s = ",";
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/persistence/CriteriaLogQuery.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/persistence/CriteriaLogQuery.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/persistence/CriteriaLogQuery.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/persistence/CriteriaLogQuery.java Tue Nov 19 02:12:21 2013
@@ -16,6 +16,14 @@
*/
package org.apache.openejb.persistence;
+import org.apache.openejb.util.LogCategory;
+import org.apache.openejb.util.Logger;
+
+import javax.persistence.FlushModeType;
+import javax.persistence.LockModeType;
+import javax.persistence.Parameter;
+import javax.persistence.TemporalType;
+import javax.persistence.TypedQuery;
import java.lang.reflect.Method;
import java.util.Calendar;
import java.util.Date;
@@ -23,13 +31,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
-import javax.persistence.FlushModeType;
-import javax.persistence.LockModeType;
-import javax.persistence.Parameter;
-import javax.persistence.TemporalType;
-import javax.persistence.TypedQuery;
-import org.apache.openejb.util.LogCategory;
-import org.apache.openejb.util.Logger;
public class CriteriaLogQuery<T> implements TypedQuery<T> {
private static final Logger LOGGER = Logger.getInstance(LogCategory.OPENEJB_JPA, CriteriaLogQuery.class);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaEntityManager.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaEntityManager.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaEntityManager.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/persistence/JtaEntityManager.java Tue Nov 19 02:12:21 2013
@@ -84,7 +84,7 @@ public class JtaEntityManager implements
this.entityManagerFactory = entityManagerFactory;
this.properties = properties;
this.extended = extended;
- logger = (unitName == null) ? baseLogger : baseLogger.getChildLogger(unitName);
+ logger = unitName == null ? baseLogger : baseLogger.getChildLogger(unitName);
}
EntityManager getEntityManager() {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceBootstrap.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceBootstrap.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceBootstrap.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceBootstrap.java Tue Nov 19 02:12:21 2013
@@ -81,8 +81,8 @@ public class PersistenceBootstrap {
public static void bootstrap(ClassLoader classLoader) {
Properties args = getAgentArgs(classLoader);
- debug = (args.getProperty("debug", "false").equalsIgnoreCase("true"));
- boolean enabled = (args.getProperty("enabled", "true").equalsIgnoreCase("true"));
+ debug = args.getProperty("debug", "false").equalsIgnoreCase("true");
+ boolean enabled = args.getProperty("enabled", "true").equalsIgnoreCase("true");
if (!enabled) {
debug("disabled");
@@ -244,7 +244,7 @@ public class PersistenceBootstrap {
}
}
- debug = (properties.getProperty("debug", "false").equalsIgnoreCase("true"));
+ debug = properties.getProperty("debug", "false").equalsIgnoreCase("true");
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/persistence/QueryLogEntityManager.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/persistence/QueryLogEntityManager.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/persistence/QueryLogEntityManager.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/persistence/QueryLogEntityManager.java Tue Nov 19 02:12:21 2013
@@ -16,7 +16,6 @@
*/
package org.apache.openejb.persistence;
-import java.util.Map;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
import javax.persistence.EntityTransaction;
@@ -27,6 +26,7 @@ import javax.persistence.TypedQuery;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.metamodel.Metamodel;
+import java.util.Map;
public class QueryLogEntityManager implements EntityManager {
private final EntityManager delegate;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/GeronimoTransactionManagerFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/GeronimoTransactionManagerFactory.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/GeronimoTransactionManagerFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/GeronimoTransactionManagerFactory.java Tue Nov 19 02:12:21 2013
@@ -21,9 +21,9 @@ package org.apache.openejb.resource;
import org.apache.geronimo.transaction.log.HOWLLog;
import org.apache.geronimo.transaction.manager.GeronimoTransactionManager;
import org.apache.geronimo.transaction.manager.TransactionLog;
+import org.apache.geronimo.transaction.manager.WrapperNamedXAResource;
import org.apache.geronimo.transaction.manager.XidFactory;
import org.apache.geronimo.transaction.manager.XidFactoryImpl;
-import org.apache.geronimo.transaction.manager.WrapperNamedXAResource;
import org.apache.openejb.api.internal.Internal;
import org.apache.openejb.api.jmx.Description;
import org.apache.openejb.api.jmx.MBean;
@@ -34,7 +34,6 @@ import org.apache.openejb.monitoring.Loc
import org.apache.openejb.monitoring.ObjectNameBuilder;
import org.apache.openejb.util.Duration;
-import javax.management.ObjectName;
import javax.transaction.xa.XAResource;
import java.util.concurrent.TimeUnit;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/IsolationLevels.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/IsolationLevels.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/IsolationLevels.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/IsolationLevels.java Tue Nov 19 02:12:21 2013
@@ -18,8 +18,8 @@ package org.apache.openejb.resource.jdbc
import org.apache.openejb.util.Join;
-import java.util.Map;
import java.util.HashMap;
+import java.util.Map;
/**
* @version $Rev$ $Date$
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/cipher/StaticDESPasswordCipher.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/cipher/StaticDESPasswordCipher.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/cipher/StaticDESPasswordCipher.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/cipher/StaticDESPasswordCipher.java Tue Nov 19 02:12:21 2013
@@ -48,7 +48,7 @@ public class StaticDESPasswordCipher imp
* in any case of error.
*/
public char[] encrypt(String plainPassword) {
- if ((null == plainPassword) || plainPassword.length() == 0) {
+ if (null == plainPassword || plainPassword.length() == 0) {
throw new IllegalArgumentException("plainPassword cannot be null nor empty.");
}
@@ -74,7 +74,7 @@ public class StaticDESPasswordCipher imp
* in any case of error.
*/
public String decrypt(char[] encodedPassword) {
- if ((null == encodedPassword) || encodedPassword.length == 0) {
+ if (null == encodedPassword || encodedPassword.length == 0) {
throw new IllegalArgumentException("encodedPassword cannot be null nor empty.");
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/JMXBasicDataSource.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/JMXBasicDataSource.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/JMXBasicDataSource.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/JMXBasicDataSource.java Tue Nov 19 02:12:21 2013
@@ -16,20 +16,20 @@
*/
package org.apache.openejb.resource.jdbc.dbcp;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.Statement;
-
import org.apache.openejb.api.internal.Internal;
import org.apache.openejb.api.jmx.Description;
-import javax.management.MBeanServer;
import org.apache.openejb.api.jmx.ManagedAttribute;
import org.apache.openejb.api.jmx.ManagedOperation;
-import javax.management.ObjectName;
import org.apache.openejb.monitoring.DynamicMBeanWrapper;
import org.apache.openejb.monitoring.LocalMBeanServer;
import org.apache.openejb.monitoring.ObjectNameBuilder;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
+
// @MBean: don't put it since it is not a pojo
@Internal
@SuppressWarnings("UnusedDeclaration")
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/router/FailOverRouter.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/router/FailOverRouter.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/router/FailOverRouter.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/router/FailOverRouter.java Tue Nov 19 02:12:21 2013
@@ -236,7 +236,7 @@ public class FailOverRouter extends Abst
for (int i = 0; i < step; i++) {
currentIdx = idx.incrementAndGet();
}
- Collections.rotate(ds, 1 + (currentIdx % ds.size()));
+ Collections.rotate(ds, 1 + currentIdx % ds.size());
return ds;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ri/sp/PseudoPolicyConfigurationFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ri/sp/PseudoPolicyConfigurationFactory.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ri/sp/PseudoPolicyConfigurationFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ri/sp/PseudoPolicyConfigurationFactory.java Tue Nov 19 02:12:21 2013
@@ -16,11 +16,11 @@
*/
package org.apache.openejb.ri.sp;
-import javax.security.jacc.PolicyConfigurationFactory;
import javax.security.jacc.PolicyConfiguration;
+import javax.security.jacc.PolicyConfigurationFactory;
import javax.security.jacc.PolicyContextException;
-import java.security.PermissionCollection;
import java.security.Permission;
+import java.security.PermissionCollection;
/**
* @version $Rev$ $Date$
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ri/sp/PseudoSecurityService.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ri/sp/PseudoSecurityService.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ri/sp/PseudoSecurityService.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ri/sp/PseudoSecurityService.java Tue Nov 19 02:12:21 2013
@@ -16,15 +16,14 @@
*/
package org.apache.openejb.ri.sp;
-import org.apache.openejb.spi.SecurityService;
import org.apache.openejb.InterfaceType;
+import org.apache.openejb.spi.SecurityService;
import javax.security.auth.login.LoginException;
-import java.util.Collection;
-import java.util.Set;
-import java.util.Collections;
-import java.security.Principal;
import java.lang.reflect.Method;
+import java.security.Principal;
+import java.util.Collections;
+import java.util.Set;
/**
* @org.apache.xbean.XBean element="pseudoSecurityService"
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ri/sp/PseudoTransactionService.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ri/sp/PseudoTransactionService.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ri/sp/PseudoTransactionService.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ri/sp/PseudoTransactionService.java Tue Nov 19 02:12:21 2013
@@ -16,12 +16,10 @@
*/
package org.apache.openejb.ri.sp;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
+import org.apache.openejb.spi.TransactionService;
+import org.apache.openejb.util.LogCategory;
+import org.apache.openejb.util.Logger;
+
import javax.transaction.InvalidTransactionException;
import javax.transaction.NotSupportedException;
import javax.transaction.RollbackException;
@@ -32,10 +30,12 @@ import javax.transaction.TransactionMana
import javax.transaction.TransactionSynchronizationRegistry;
import javax.transaction.xa.XAException;
import javax.transaction.xa.XAResource;
-
-import org.apache.openejb.spi.TransactionService;
-import org.apache.openejb.util.LogCategory;
-import org.apache.openejb.util.Logger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
/**
* @org.apache.xbean.XBean element="pseudoTransactionService"
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/spi/ApplicationServer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/spi/ApplicationServer.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/spi/ApplicationServer.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/spi/ApplicationServer.java Tue Nov 19 02:12:21 2013
@@ -16,14 +16,14 @@
*/
package org.apache.openejb.spi;
+import org.apache.openejb.ProxyInfo;
+
import javax.ejb.EJBHome;
import javax.ejb.EJBMetaData;
import javax.ejb.EJBObject;
import javax.ejb.Handle;
import javax.ejb.HomeHandle;
-import org.apache.openejb.ProxyInfo;
-
/**
* <h2><b>LOCAL to REMOTE SERIALIZATION</b></h2> <p>
*
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/spi/Assembler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/spi/Assembler.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/spi/Assembler.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/spi/Assembler.java Tue Nov 19 02:12:21 2013
@@ -16,11 +16,10 @@
*/
package org.apache.openejb.spi;
-import java.util.Properties;
+import org.apache.openejb.OpenEJBException;
import javax.transaction.TransactionManager;
-
-import org.apache.openejb.OpenEJBException;
+import java.util.Properties;
public interface Assembler {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/table/Line.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/table/Line.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/table/Line.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/table/Line.java Tue Nov 19 02:12:21 2013
@@ -49,7 +49,7 @@ public class Line {
sb.append(EMPTY_CHAR);
}
sb.append(columns[i]);
- for (int k = 0; k < spaces - (spaces / 2); k++) {
+ for (int k = 0; k < spaces - spaces / 2; k++) {
sb.append(EMPTY_CHAR);
}
sb.append(EMPTY_CHAR).append(COL_SEP);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java Tue Nov 19 02:12:21 2013
@@ -602,7 +602,7 @@ public final class ApplicationComposers
assembler.buildContainerSystem(openEjbConfiguration);
if ("true".equals(configuration.getProperty(OpenEjbContainer.OPENEJB_EMBEDDED_REMOTABLE, "false"))
- || (annotation != null || annotationOld != null)) {
+ || annotation != null || annotationOld != null) {
try {
if (annotation != null) {
initFilteredServiceManager(annotation.value());
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/ArrayEnumeration.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/ArrayEnumeration.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/ArrayEnumeration.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/ArrayEnumeration.java Tue Nov 19 02:12:21 2013
@@ -62,7 +62,7 @@ public final class ArrayEnumeration impl
}
public boolean hasMoreElements() {
- return (elementsIndex < elements.length);
+ return elementsIndex < elements.length;
}
public Object nextElement() {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Base64.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Base64.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Base64.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Base64.java Tue Nov 19 02:12:21 2013
@@ -275,7 +275,7 @@ public class Base64 {
if (isChunked) {
nbrChunks =
- (CHUNK_SEPARATOR.length == 0 ? 0 : (int) Math.ceil((float) encodedDataLength / CHUNK_SIZE));
+ CHUNK_SEPARATOR.length == 0 ? 0 : (int) Math.ceil((float) encodedDataLength / CHUNK_SIZE);
encodedDataLength += nbrChunks * CHUNK_SEPARATOR.length;
}
@@ -302,20 +302,20 @@ public class Base64 {
k = (byte) (b1 & 0x03);
byte val1 =
- ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte) ((b1) >> 2 ^ 0xc0);
+ (b1 & SIGN) == 0 ? (byte) (b1 >> 2) : (byte) (b1 >> 2 ^ 0xc0);
byte val2 =
- ((b2 & SIGN) == 0) ? (byte) (b2 >> 4) : (byte) ((b2) >> 4 ^ 0xf0);
+ (b2 & SIGN) == 0 ? (byte) (b2 >> 4) : (byte) (b2 >> 4 ^ 0xf0);
byte val3 =
- ((b3 & SIGN) == 0) ? (byte) (b3 >> 6) : (byte) ((b3) >> 6 ^ 0xfc);
+ (b3 & SIGN) == 0 ? (byte) (b3 >> 6) : (byte) (b3 >> 6 ^ 0xfc);
encodedData[encodedIndex] = lookUpBase64Alphabet[val1];
//log.debug( "val2 = " + val2 );
//log.debug( "k4 = " + (k<<4) );
//log.debug( "vak = " + (val2 | (k<<4)) );
encodedData[encodedIndex + 1] =
- lookUpBase64Alphabet[val2 | (k << 4)];
+ lookUpBase64Alphabet[val2 | k << 4];
encodedData[encodedIndex + 2] =
- lookUpBase64Alphabet[(l << 2) | val3];
+ lookUpBase64Alphabet[l << 2 | val3];
encodedData[encodedIndex + 3] = lookUpBase64Alphabet[b3 & 0x3f];
encodedIndex += 4;
@@ -332,8 +332,8 @@ public class Base64 {
CHUNK_SEPARATOR.length);
chunksSoFar++;
nextSeparatorIndex =
- (CHUNK_SIZE * (chunksSoFar + 1)) +
- (chunksSoFar * CHUNK_SEPARATOR.length);
+ CHUNK_SIZE * (chunksSoFar + 1) +
+ chunksSoFar * CHUNK_SEPARATOR.length;
encodedIndex += CHUNK_SEPARATOR.length;
}
}
@@ -348,7 +348,7 @@ public class Base64 {
//log.debug("b1=" + b1);
//log.debug("b1<<2 = " + (b1>>2) );
byte val1 =
- ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte) ((b1) >> 2 ^ 0xc0);
+ (b1 & SIGN) == 0 ? (byte) (b1 >> 2) : (byte) (b1 >> 2 ^ 0xc0);
encodedData[encodedIndex] = lookUpBase64Alphabet[val1];
encodedData[encodedIndex + 1] = lookUpBase64Alphabet[k << 4];
encodedData[encodedIndex + 2] = PAD;
@@ -361,13 +361,13 @@ public class Base64 {
k = (byte) (b1 & 0x03);
byte val1 =
- ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte) ((b1) >> 2 ^ 0xc0);
+ (b1 & SIGN) == 0 ? (byte) (b1 >> 2) : (byte) (b1 >> 2 ^ 0xc0);
byte val2 =
- ((b2 & SIGN) == 0) ? (byte) (b2 >> 4) : (byte) ((b2) >> 4 ^ 0xf0);
+ (b2 & SIGN) == 0 ? (byte) (b2 >> 4) : (byte) (b2 >> 4 ^ 0xf0);
encodedData[encodedIndex] = lookUpBase64Alphabet[val1];
encodedData[encodedIndex + 1] =
- lookUpBase64Alphabet[val2 | (k << 4)];
+ lookUpBase64Alphabet[val2 | k << 4];
encodedData[encodedIndex + 2] = lookUpBase64Alphabet[l << 2];
encodedData[encodedIndex + 3] = PAD;
}
@@ -437,7 +437,7 @@ public class Base64 {
decodedData[encodedIndex] = (byte) (b1 << 2 | b2 >> 4);
decodedData[encodedIndex + 1] =
- (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf));
+ (byte) ((b2 & 0xf) << 4 | b3 >> 2 & 0xf);
decodedData[encodedIndex + 2] = (byte) (b3 << 6 | b4);
} else if (marker0 == PAD) {
//Two PAD e.g. 3c[Pad][Pad]
@@ -448,7 +448,7 @@ public class Base64 {
decodedData[encodedIndex] = (byte) (b1 << 2 | b2 >> 4);
decodedData[encodedIndex + 1] =
- (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf));
+ (byte) ((b2 & 0xf) << 4 | b3 >> 2 & 0xf);
}
encodedIndex += 3;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Classes.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Classes.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Classes.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Classes.java Tue Nov 19 02:12:21 2013
@@ -16,11 +16,11 @@
*/
package org.apache.openejb.util;
+import java.lang.reflect.Array;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
-import java.util.ArrayList;
import java.util.Map;
-import java.lang.reflect.Array;
/**
* @version $Rev$ $Date$
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/ConfUtils.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/ConfUtils.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/ConfUtils.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/ConfUtils.java Tue Nov 19 02:12:21 2013
@@ -24,9 +24,9 @@ import org.apache.openejb.loader.SystemI
import java.io.File;
import java.io.IOException;
import java.net.URL;
-import java.util.Enumeration;
-import java.util.Collections;
import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
/**
* @version $Rev$ $Date$
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/CountingLatch.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/CountingLatch.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/CountingLatch.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/CountingLatch.java Tue Nov 19 02:12:21 2013
@@ -16,8 +16,8 @@
*/
package org.apache.openejb.util;
-import java.util.concurrent.locks.AbstractQueuedSynchronizer;
import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.AbstractQueuedSynchronizer;
/**
* @version $Rev$ $Date$
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/DirectoryMonitor.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/DirectoryMonitor.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/DirectoryMonitor.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/DirectoryMonitor.java Tue Nov 19 02:12:21 2013
@@ -96,7 +96,7 @@ public class DirectoryMonitor {
private void initialize() {
getLogger().debug("Doing initial scan of " + target.getAbsolutePath());
- final File[] files = (target.isDirectory()) ? target.listFiles() : new File[]{target};
+ final File[] files = target.isDirectory() ? target.listFiles() : new File[]{target};
if (files != null) {
for (final File file : files) {
@@ -133,7 +133,7 @@ public class DirectoryMonitor {
*/
public void scan() {
- final File[] files = (target.isDirectory()) ? target.listFiles() : new File[]{target};
+ final File[] files = target.isDirectory() ? target.listFiles() : new File[]{target};
final HashSet<String> missingFilesList = new HashSet<String>(this.files.keySet());
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Duration.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Duration.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Duration.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Duration.java Tue Nov 19 02:12:21 2013
@@ -17,10 +17,9 @@
package org.apache.openejb.util;
import java.beans.PropertyEditorManager;
-import java.util.concurrent.TimeUnit;
-import java.util.Collection;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
public class Duration {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Enumerator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Enumerator.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Enumerator.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Enumerator.java Tue Nov 19 02:12:21 2013
@@ -30,7 +30,7 @@ public class Enumerator implements java.
}
public boolean hasMoreElements() {
- return (index < list.size());
+ return index < list.size();
}
public Object nextElement() {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/ExecutorBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/ExecutorBuilder.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/ExecutorBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/ExecutorBuilder.java Tue Nov 19 02:12:21 2013
@@ -88,7 +88,7 @@ public class ExecutorBuilder {
final boolean allowCoreThreadTimeout = options.get(prefix + ".AllowCoreThreadTimeOut", true);
// If the user explicitly set the QueueSize to 0, we default QueueType to SYNCHRONOUS
- final QueueType defaultQueueType = (qsize < 1) ? QueueType.SYNCHRONOUS : QueueType.LINKED;
+ final QueueType defaultQueueType = qsize < 1 ? QueueType.SYNCHRONOUS : QueueType.LINKED;
final BlockingQueue<Runnable> queue = options.get(prefix + ".QueueType", defaultQueueType).create(options, prefix, qsize);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JarExtractor.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JarExtractor.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JarExtractor.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JarExtractor.java Tue Nov 19 02:12:21 2013
@@ -137,7 +137,7 @@ public class JarExtractor {
if (files == null) {
files = new String[0];
}
- for (int i = 0; (i < files.length) && result; i++) {
+ for (int i = 0; i < files.length && result; i++) {
final File fileSrc = new File(src, files[i]);
final File fileDest = new File(dest, files[i]);
@@ -150,8 +150,8 @@ public class JarExtractor {
FileChannel ic = null;
FileChannel oc = null;
try {
- ic = (new FileInputStream(fileSrc)).getChannel();
- oc = (new FileOutputStream(fileDest)).getChannel();
+ ic = new FileInputStream(fileSrc).getChannel();
+ oc = new FileOutputStream(fileDest).getChannel();
ic.transferTo(0, ic.size(), oc);
} catch (IOException e) {
logger.error("Copy failed: src: " + fileSrc + ", dest: " + fileDest, e);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStream.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStream.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStream.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStream.java Tue Nov 19 02:12:21 2013
@@ -173,7 +173,7 @@ public class JuliLogStream implements Lo
private void initSource() {
if (!sourceInited) {
// search back up the stack for the first use of the OpenEJB Logger
- StackTraceElement[] elements = (new Throwable()).getStackTrace();
+ StackTraceElement[] elements = new Throwable().getStackTrace();
int i = 0;
String current = null;
for (; i < elements.length; i++) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java Tue Nov 19 02:12:21 2013
@@ -25,7 +25,8 @@ import org.apache.openejb.util.reflectio
import java.io.OutputStreamWriter;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
-import java.util.logging.*;
+import java.util.logging.ConsoleHandler;
+import java.util.logging.LogManager;
import java.util.logging.Logger;
/**
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java Tue Nov 19 02:12:21 2013
@@ -19,7 +19,6 @@ package org.apache.openejb.util;
import org.apache.log4j.ConsoleAppender;
import org.apache.log4j.PropertyConfigurator;
import org.apache.log4j.SimpleLayout;
-import org.apache.openejb.cdi.logging.Log4jLoggerFactory;
import org.apache.openejb.loader.FileUtils;
import org.apache.openejb.loader.IO;
import org.apache.openejb.loader.SystemInstance;
@@ -71,7 +70,7 @@ public class Log4jLogStreamFactory imple
//Use the old file name first
File loggingPropertiesFile = new File(confDir, LOGGING_PROPERTIES_FILE);
- if ((!embedded && confDir.exists()) || (embedded && loggingPropertiesFile.exists())) {
+ if (!embedded && confDir.exists() || embedded && loggingPropertiesFile.exists()) {
if (!loggingPropertiesFile.exists()) {
//Use the new file name
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jPrintWriter.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jPrintWriter.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jPrintWriter.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jPrintWriter.java Tue Nov 19 02:12:21 2013
@@ -16,7 +16,7 @@
*/
package org.apache.openejb.util;
-import org.apache.log4j.*;
+import org.apache.log4j.Priority;
import java.io.PrintWriter;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/ObjectRecipeHelper.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/ObjectRecipeHelper.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/ObjectRecipeHelper.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/ObjectRecipeHelper.java Tue Nov 19 02:12:21 2013
@@ -16,13 +16,14 @@
*/
package org.apache.openejb.util;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
import org.apache.openejb.loader.SystemInstance;
import org.apache.xbean.recipe.ObjectRecipe;
import org.apache.xbean.recipe.Option;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
public final class ObjectRecipeHelper {
private ObjectRecipeHelper() {
// no-op
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/OpenEJBErrorHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/OpenEJBErrorHandler.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/OpenEJBErrorHandler.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/OpenEJBErrorHandler.java Tue Nov 19 02:12:21 2013
@@ -16,11 +16,11 @@
*/
package org.apache.openejb.util;
+import org.apache.openejb.OpenEJBException;
+
import java.io.ByteArrayOutputStream;
import java.io.PrintWriter;
-import org.apache.openejb.OpenEJBException;
-
public class OpenEJBErrorHandler {
private static Logger _logger = Logger.getInstance(LogCategory.OPENEJB, "org.apache.openejb.util.resources");
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/OpenEjbVersion.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/OpenEjbVersion.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/OpenEjbVersion.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/OpenEjbVersion.java Tue Nov 19 02:12:21 2013
@@ -18,8 +18,8 @@ package org.apache.openejb.util;
import org.apache.xbean.finder.ResourceFinder;
-import java.util.Properties;
import java.io.PrintStream;
+import java.util.Properties;
/**
* @version $Rev$ $Date$
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/PassthroughFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/PassthroughFactory.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/PassthroughFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/PassthroughFactory.java Tue Nov 19 02:12:21 2013
@@ -17,7 +17,6 @@
package org.apache.openejb.util;
import org.apache.xbean.recipe.ObjectRecipe;
-import org.apache.openejb.InjectionProcessor;
/**
* @version $Rev$ $Date$
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/PojoExternalization.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/PojoExternalization.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/PojoExternalization.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/PojoExternalization.java Tue Nov 19 02:12:21 2013
@@ -17,16 +17,10 @@
package org.apache.openejb.util;
import java.io.Externalizable;
-import java.io.ObjectStreamException;
-import java.io.ObjectInput;
import java.io.IOException;
+import java.io.ObjectInput;
import java.io.ObjectOutput;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.lang.reflect.Field;
-import java.lang.reflect.Constructor;
-import java.util.List;
-import java.util.ArrayList;
+import java.io.ObjectStreamException;
/**
* Works with objects that have a public no-arg constructor
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/PojoSerialization.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/PojoSerialization.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/PojoSerialization.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/PojoSerialization.java Tue Nov 19 02:12:21 2013
@@ -21,7 +21,6 @@ import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.io.ObjectStreamException;
import java.io.Serializable;
-import java.lang.Class;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java Tue Nov 19 02:12:21 2013
@@ -101,7 +101,7 @@ public class Pool<T> {
if (maxAge != 0 && idleTimeout > maxAge) greater("MaxAge", maxAge, "IdleTimeout", idleTimeout);
this.executor = executor != null ? executor : createExecutor();
this.supplier = supplier != null ? supplier : new NoSupplier();
- this.available = (strict) ? new Semaphore(max) : new Overdraft(max);
+ this.available = strict ? new Semaphore(max) : new Overdraft(max);
this.minimum = new Semaphore(min);
this.instances = new Semaphore(max);
this.maxAge = maxAge;
@@ -304,7 +304,7 @@ public class Pool<T> {
boolean release = true;
Event event = Event.FULL;
- final Entry.Instance obj = (entry == null) ? null : entry.active.getAndSet(null);
+ final Entry.Instance obj = entry == null ? null : entry.active.getAndSet(null);
try {
if (entry == null) return added;
@@ -319,7 +319,7 @@ public class Pool<T> {
if (aged || flushed) {
if (aged) event = Event.AGED;
if (flushed) event = Event.FLUSHED;
- if (entry.hasHardReference() || (aged && replaceAged) || (flushed && replaceFlushed)) {
+ if (entry.hasHardReference() || aged && replaceAged || flushed && replaceFlushed) {
// Don't release the lock, this
// entry will be directly replaced
release = false;
@@ -699,7 +699,7 @@ public class Pool<T> {
}
for (int i = 0; i < replace.size(); i++) {
- final long offset = maxAge > 0 ? ((long) (maxAge / replace.size() * i * maxAgeOffset)) % maxAge : 0l;
+ final long offset = maxAge > 0 ? (long) (maxAge / replace.size() * i * maxAgeOffset) % maxAge : 0l;
executor.execute(new Replace(replace.get(i).entry, offset));
}
}
@@ -1148,7 +1148,7 @@ public class Pool<T> {
SchedulerThreadFactory() {
final SecurityManager s = System.getSecurityManager();
- this.group = (s != null) ? s.getThreadGroup() : Thread.currentThread().getThreadGroup();
+ this.group = s != null ? s.getThreadGroup() : Thread.currentThread().getThreadGroup();
}
@Override
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/PropertiesService.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/PropertiesService.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/PropertiesService.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/PropertiesService.java Tue Nov 19 02:12:21 2013
@@ -16,8 +16,6 @@
*/
package org.apache.openejb.util;
-import java.util.HashMap;
-import java.util.Map;
import java.util.Properties;
/**
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/SetAccessible.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/SetAccessible.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/SetAccessible.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/SetAccessible.java Tue Nov 19 02:12:21 2013
@@ -16,9 +16,9 @@
*/
package org.apache.openejb.util;
-import java.security.PrivilegedAction;
-import java.security.AccessController;
import java.lang.reflect.AccessibleObject;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
/**
* @version $Rev$ $Date$
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Slf4jLogStreamFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Slf4jLogStreamFactory.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Slf4jLogStreamFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Slf4jLogStreamFactory.java Tue Nov 19 02:12:21 2013
@@ -16,8 +16,6 @@
*/
package org.apache.openejb.util;
-import org.apache.openejb.cdi.logging.Slf4jLoggerFactory;
-
/**
* Simple Slf4jLogStream, not much configuration needed, as slf4j is just a facade
*
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Strings.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Strings.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Strings.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Strings.java Tue Nov 19 02:12:21 2013
@@ -87,11 +87,11 @@ public class Strings {
}
public static boolean checkNullBlankString(String stringToCheck) {
- return (stringToCheck == null || "".equals(stringToCheck.trim()));
+ return stringToCheck == null || "".equals(stringToCheck.trim());
}
public static String replaceNullOrBlankStringWithNonBreakingSpace(String stringToCheckForNull) {
- if ((stringToCheckForNull == null) || (stringToCheckForNull.equals(""))) {
+ if (stringToCheckForNull == null || stringToCheckForNull.equals("")) {
return " ";
} else {
return stringToCheckForNull;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/SuperProperties.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/SuperProperties.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/SuperProperties.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/SuperProperties.java Tue Nov 19 02:12:21 2013
@@ -835,7 +835,7 @@ public class SuperProperties extends Pro
buffer.append("\\r");
break;
default:
- if ("\\".indexOf(ch) >= 0 || (key && "#!=: ".indexOf(ch) >= 0))
+ if ("\\".indexOf(ch) >= 0 || key && "#!=: ".indexOf(ch) >= 0)
{
buffer.append('\\');
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Tee.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Tee.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Tee.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Tee.java Tue Nov 19 02:12:21 2013
@@ -17,11 +17,8 @@
package org.apache.openejb.util;
-import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.io.PipedInputStream;
-import java.io.PipedOutputStream;
/**
* @version $Rev$ $Date$
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/UpdateChecker.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/UpdateChecker.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/UpdateChecker.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/UpdateChecker.java Tue Nov 19 02:12:21 2013
@@ -16,16 +16,16 @@
*/
package org.apache.openejb.util;
+import org.apache.openejb.loader.IO;
+import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.observer.Observes;
+import org.apache.openejb.observer.event.ObserverAdded;
+
import java.io.IOException;
import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
-
import java.util.Properties;
-import org.apache.openejb.loader.IO;
-import org.apache.openejb.loader.SystemInstance;
-import org.apache.openejb.observer.Observes;
-import org.apache.openejb.observer.event.ObserverAdded;
public class UpdateChecker {
private static final Logger LOGGER = Logger.getInstance(LogCategory.OPENEJB_STARTUP, UpdateChecker.class);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/UrlCache.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/UrlCache.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/UrlCache.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/UrlCache.java Tue Nov 19 02:12:21 2013
@@ -28,7 +28,15 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.StringTokenizer;
+import java.util.TreeMap;
import java.util.jar.Attributes;
import java.util.jar.JarFile;
import java.util.jar.Manifest;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/UrlComparator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/UrlComparator.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/UrlComparator.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/UrlComparator.java Tue Nov 19 02:12:21 2013
@@ -16,12 +16,12 @@
*/
package org.apache.openejb.util;
+import java.io.File;
import java.net.URL;
+import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.ListIterator;
-import java.util.ArrayList;
-import java.io.File;
/**
* @version $Rev$ $Date$
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/DynamicProxyImplFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/DynamicProxyImplFactory.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/DynamicProxyImplFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/DynamicProxyImplFactory.java Tue Nov 19 02:12:21 2013
@@ -27,7 +27,7 @@ import org.apache.xbean.finder.MetaAnnot
import javax.naming.NamingException;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
-import java.lang.reflect.*;
+import java.lang.reflect.Method;
public class DynamicProxyImplFactory {
public static boolean isKnownDynamicallyImplemented(Class<?> clazz) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java Tue Nov 19 02:12:21 2013
@@ -187,8 +187,8 @@ public class LocalBeanProxyFactory imple
final String name = method.getName();
if (Modifier.isPublic(method.getModifiers())
- || (method.getParameterTypes().length == 0 && ("finalize".equals(name)
- || "clone".equals(name)))) {
+ || method.getParameterTypes().length == 0 && ("finalize".equals(name)
+ || "clone".equals(name))) {
// forward invocations of any public methods or
// finalize/clone methods to businessHandler
processMethod(cw, method, proxyClassFileName, BUSSINESS_HANDLER_NAME);
@@ -380,7 +380,7 @@ public class LocalBeanProxyFactory imple
// cast the result
mv.visitTypeInsn(CHECKCAST, getCastType(returnType));
- if (returnType.isPrimitive() && (!Void.TYPE.equals(returnType))) {
+ if (returnType.isPrimitive() && !Void.TYPE.equals(returnType)) {
// get the primitive value
mv.visitMethodInsn(INVOKEVIRTUAL, getWrapperType(returnType), getPrimitiveMethod(returnType), "()" + getPrimitiveLetter(returnType));
}
@@ -423,7 +423,7 @@ public class LocalBeanProxyFactory imple
mv.visitInsn(ATHROW);
mv.visitLabel(l6);
- if (i == (exceptionTypes.length - 1)) {
+ if (i == exceptionTypes.length - 1) {
mv.visitTypeInsn(NEW, "java/lang/reflect/UndeclaredThrowableException");
mv.visitInsn(DUP);
mv.visitVarInsn(ALOAD, length);
Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/ApplicationTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/ApplicationTest.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/ApplicationTest.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/ApplicationTest.java Tue Nov 19 02:12:21 2013
@@ -16,8 +16,8 @@
*/
package org.apache.openejb;
-import junit.framework.TestCase;
import junit.framework.Test;
+import junit.framework.TestCase;
/**
* To run this from your ide, set -Dopenejb.home=target/test-classes/
Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/DeploymentContextPropertiesTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/DeploymentContextPropertiesTest.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/DeploymentContextPropertiesTest.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/DeploymentContextPropertiesTest.java Tue Nov 19 02:12:21 2013
@@ -17,7 +17,6 @@
package org.apache.openejb;
import junit.framework.TestCase;
-import org.apache.openejb.BeanContext;
import org.apache.openejb.assembler.classic.AppInfo;
import org.apache.openejb.assembler.classic.Assembler;
import org.apache.openejb.assembler.classic.EjbJarInfo;
Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/RecycleTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/RecycleTest.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/RecycleTest.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/RecycleTest.java Tue Nov 19 02:12:21 2013
@@ -17,13 +17,12 @@
package org.apache.openejb;
import junit.framework.TestCase;
+import org.apache.openejb.core.LocalInitialContextFactory;
-import javax.naming.InitialContext;
import javax.naming.Context;
+import javax.naming.InitialContext;
import java.util.Properties;
-import org.apache.openejb.core.LocalInitialContextFactory;
-
/**
* @version $Rev$ $Date$
*/
Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/AccessTimeoutTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/AccessTimeoutTest.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/AccessTimeoutTest.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/AccessTimeoutTest.java Tue Nov 19 02:12:21 2013
@@ -17,10 +17,8 @@
package org.apache.openejb.assembler.classic;
import junit.framework.TestCase;
-import org.apache.openejb.cdi.ThreadSingletonService;
-import org.apache.openejb.cdi.ThreadSingletonServiceImpl;
-import org.apache.openejb.config.ConfigurationFactory;
import org.apache.openejb.BeanContext;
+import org.apache.openejb.config.ConfigurationFactory;
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.SingletonBean;
import org.apache.openejb.loader.SystemInstance;