mirror of https://github.com/apache/activemq.git
[AMQ-8279] Compiler warning cleanups
- Remove unsused imports (exept for generated classes) - Convert to T.valueOf on boxed primitives from new T()
This commit is contained in:
parent
fc80b86ac6
commit
2cc17a2fa0
|
@ -151,7 +151,7 @@ public final class TypeConversionSupport {
|
||||||
CONVERSION_MAP.put(new ConversionKey(Float.class, Double.class), new Converter() {
|
CONVERSION_MAP.put(new ConversionKey(Float.class, Double.class), new Converter() {
|
||||||
@Override
|
@Override
|
||||||
public Object convert(Object value) {
|
public Object convert(Object value) {
|
||||||
return new Double(((Number) value).doubleValue());
|
return Double.valueOf(((Number) value).doubleValue());
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -216,7 +216,7 @@ public class MessageTransformationTest {
|
||||||
|
|
||||||
Message incomingMessage = Proton.message();
|
Message incomingMessage = Proton.message();
|
||||||
|
|
||||||
incomingMessage.setBody(new AmqpValue(new Boolean(true)));
|
incomingMessage.setBody(new AmqpValue(Boolean.TRUE));
|
||||||
|
|
||||||
EncodedMessage encoded = encode(incomingMessage);
|
EncodedMessage encoded = encode(incomingMessage);
|
||||||
InboundTransformer inboundTransformer = getInboundTransformer();
|
InboundTransformer inboundTransformer = getInboundTransformer();
|
||||||
|
|
|
@ -302,7 +302,7 @@ public final class OpenTypeSupport {
|
||||||
// In 1.6 it seems it is supported.. but until then...
|
// In 1.6 it seems it is supported.. but until then...
|
||||||
Byte data[] = new Byte[preview.length];
|
Byte data[] = new Byte[preview.length];
|
||||||
for (int i = 0; i < data.length; i++) {
|
for (int i = 0; i < data.length; i++) {
|
||||||
data[i] = new Byte(preview[i]);
|
data[i] = Byte.valueOf(preview[i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
rc.put(CompositeDataConstants.BODY_PREVIEW, data);
|
rc.put(CompositeDataConstants.BODY_PREVIEW, data);
|
||||||
|
|
|
@ -706,9 +706,9 @@ public abstract class BaseDestination implements Destination {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isFlowControlLogRequired()) {
|
if (isFlowControlLogRequired()) {
|
||||||
getLog().warn("{}: {} (blocking for: {}s)", new Object[]{ usage, warning, new Long(((System.currentTimeMillis() - start) / 1000))});
|
getLog().warn("{}: {} (blocking for: {}s)", new Object[]{ usage, warning, Long.valueOf(((System.currentTimeMillis() - start) / 1000))});
|
||||||
} else {
|
} else {
|
||||||
getLog().debug("{}: {} (blocking for: {}s)", new Object[]{ usage, warning, new Long(((System.currentTimeMillis() - start) / 1000))});
|
getLog().debug("{}: {} (blocking for: {}s)", new Object[]{ usage, warning, Long.valueOf(((System.currentTimeMillis() - start) / 1000))});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
long finish = System.currentTimeMillis();
|
long finish = System.currentTimeMillis();
|
||||||
|
|
|
@ -304,7 +304,7 @@ public class Queue extends BaseDestination implements Task, UsageListener, Index
|
||||||
if ((recoveredAccumulator % 10000) == 0) {
|
if ((recoveredAccumulator % 10000) == 0) {
|
||||||
LOG.info("cursor for {} has recovered {} messages. {}% complete",
|
LOG.info("cursor for {} has recovered {} messages. {}% complete",
|
||||||
getActiveMQDestination().getQualifiedName(), recoveredAccumulator,
|
getActiveMQDestination().getQualifiedName(), recoveredAccumulator,
|
||||||
new Integer((int) (recoveredAccumulator * 100 / totalMessageCount)));
|
Integer.valueOf((int) (recoveredAccumulator * 100 / totalMessageCount)));
|
||||||
}
|
}
|
||||||
// Message could have expired while it was being
|
// Message could have expired while it was being
|
||||||
// loaded..
|
// loaded..
|
||||||
|
|
|
@ -753,7 +753,7 @@ public class RegionBroker extends EmptyBroker {
|
||||||
boolean stamped = false;
|
boolean stamped = false;
|
||||||
if (message.getProperty(ORIGINAL_EXPIRATION) == null) {
|
if (message.getProperty(ORIGINAL_EXPIRATION) == null) {
|
||||||
long expiration = message.getExpiration();
|
long expiration = message.getExpiration();
|
||||||
message.setProperty(ORIGINAL_EXPIRATION, new Long(expiration));
|
message.setProperty(ORIGINAL_EXPIRATION, Long.valueOf(expiration));
|
||||||
stamped = true;
|
stamped = true;
|
||||||
}
|
}
|
||||||
return stamped;
|
return stamped;
|
||||||
|
|
|
@ -50,9 +50,9 @@ public class ConnectionFactoryProvider {
|
||||||
String jndiName = getString(config, OSGI_JNDI_SERVICE_NAME, "jms/local");
|
String jndiName = getString(config, OSGI_JNDI_SERVICE_NAME, "jms/local");
|
||||||
String userName = getString(config, "userName", null);
|
String userName = getString(config, "userName", null);
|
||||||
String password = getString(config, "password", null);
|
String password = getString(config, "password", null);
|
||||||
long expiryTimeout = new Long(getString(config, "expiryTimeout", "0"));
|
long expiryTimeout = Long.valueOf(getString(config, "expiryTimeout", "0"));
|
||||||
int idleTimeout = new Integer(getString(config, "idleTimeout", "30000"));
|
int idleTimeout = Integer.valueOf(getString(config, "idleTimeout", "30000"));
|
||||||
int maxConnections = new Integer(getString(config, "maxConnections", "8"));
|
int maxConnections = Integer.valueOf(getString(config, "maxConnections", "8"));
|
||||||
ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory(brokerURL);
|
ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory(brokerURL);
|
||||||
if (userName != null) {
|
if (userName != null) {
|
||||||
cf.setUserName(userName);
|
cf.setUserName(userName);
|
||||||
|
|
|
@ -17,10 +17,6 @@
|
||||||
|
|
||||||
package org.apache.activemq;
|
package org.apache.activemq;
|
||||||
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.LinkedList;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.concurrent.CountDownLatch;
|
|
||||||
import java.util.concurrent.atomic.AtomicInteger;
|
import java.util.concurrent.atomic.AtomicInteger;
|
||||||
|
|
||||||
import javax.jms.ConnectionConsumer;
|
import javax.jms.ConnectionConsumer;
|
||||||
|
@ -30,7 +26,6 @@ import javax.jms.ServerSession;
|
||||||
import javax.jms.ServerSessionPool;
|
import javax.jms.ServerSessionPool;
|
||||||
import javax.jms.Session;
|
import javax.jms.Session;
|
||||||
|
|
||||||
import org.apache.activemq.command.ConsumerId;
|
|
||||||
import org.apache.activemq.command.ConsumerInfo;
|
import org.apache.activemq.command.ConsumerInfo;
|
||||||
import org.apache.activemq.command.MessageDispatch;
|
import org.apache.activemq.command.MessageDispatch;
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,6 @@ import java.util.Iterator;
|
||||||
import java.util.LinkedList;
|
import java.util.LinkedList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Map.Entry;
|
|
||||||
import java.util.concurrent.ExecutorService;
|
import java.util.concurrent.ExecutorService;
|
||||||
import java.util.concurrent.Executors;
|
import java.util.concurrent.Executors;
|
||||||
import java.util.concurrent.atomic.AtomicBoolean;
|
import java.util.concurrent.atomic.AtomicBoolean;
|
||||||
|
|
|
@ -22,7 +22,6 @@ import java.io.IOException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import java.io.OutputStream;
|
import java.io.OutputStream;
|
||||||
import java.net.HttpURLConnection;
|
import java.net.HttpURLConnection;
|
||||||
import java.net.MalformedURLException;
|
|
||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
|
|
||||||
import javax.jms.JMSException;
|
import javax.jms.JMSException;
|
||||||
|
|
|
@ -23,7 +23,6 @@ import java.net.URL;
|
||||||
|
|
||||||
import javax.jms.JMSException;
|
import javax.jms.JMSException;
|
||||||
|
|
||||||
import org.apache.activemq.command.ActiveMQBlobMessage;
|
|
||||||
import org.apache.commons.net.ftp.FTPClient;
|
import org.apache.commons.net.ftp.FTPClient;
|
||||||
|
|
||||||
public class FTPStrategy {
|
public class FTPStrategy {
|
||||||
|
|
|
@ -229,7 +229,7 @@ public class CronParser {
|
||||||
}
|
}
|
||||||
|
|
||||||
static boolean isCurrent(final CronEntry entry, final int current) throws MessageFormatException {
|
static boolean isCurrent(final CronEntry entry, final int current) throws MessageFormatException {
|
||||||
boolean result = entry.currentWhen.contains(new Integer(current));
|
boolean result = entry.currentWhen.contains(Integer.valueOf(current));
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -676,7 +676,7 @@ public class ActiveMQMapMessage extends ActiveMQMessage implements MapMessage {
|
||||||
@Override
|
@Override
|
||||||
public void setFloat(String name, float value) throws JMSException {
|
public void setFloat(String name, float value) throws JMSException {
|
||||||
initializeWriting();
|
initializeWriting();
|
||||||
put(name, new Float(value));
|
put(name, Float.valueOf(value));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -693,7 +693,7 @@ public class ActiveMQMapMessage extends ActiveMQMessage implements MapMessage {
|
||||||
@Override
|
@Override
|
||||||
public void setDouble(String name, double value) throws JMSException {
|
public void setDouble(String name, double value) throws JMSException {
|
||||||
initializeWriting();
|
initializeWriting();
|
||||||
put(name, new Double(value));
|
put(name, Double.valueOf(value));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -723,12 +723,12 @@ public class ActiveMQMessage extends Message implements org.apache.activemq.Mess
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setFloatProperty(String name, float value) throws JMSException {
|
public void setFloatProperty(String name, float value) throws JMSException {
|
||||||
setObjectProperty(name, new Float(value));
|
setObjectProperty(name, Float.valueOf(value));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setDoubleProperty(String name, double value) throws JMSException {
|
public void setDoubleProperty(String name, double value) throws JMSException {
|
||||||
setObjectProperty(name, new Double(value));
|
setObjectProperty(name, Double.valueOf(value));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -24,10 +24,8 @@ import java.io.InputStream;
|
||||||
import java.io.ObjectOutputStream;
|
import java.io.ObjectOutputStream;
|
||||||
import java.io.OutputStream;
|
import java.io.OutputStream;
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
|
||||||
import java.util.zip.DeflaterOutputStream;
|
import java.util.zip.DeflaterOutputStream;
|
||||||
import java.util.zip.InflaterInputStream;
|
import java.util.zip.InflaterInputStream;
|
||||||
|
|
||||||
|
|
|
@ -634,28 +634,28 @@ public class ActiveMQStreamMessage extends ActiveMQMessage implements StreamMess
|
||||||
return this.dataIn.readUTF();
|
return this.dataIn.readUTF();
|
||||||
}
|
}
|
||||||
if (type == MarshallingSupport.LONG_TYPE) {
|
if (type == MarshallingSupport.LONG_TYPE) {
|
||||||
return new Long(this.dataIn.readLong()).toString();
|
return Long.toString(this.dataIn.readLong());
|
||||||
}
|
}
|
||||||
if (type == MarshallingSupport.INTEGER_TYPE) {
|
if (type == MarshallingSupport.INTEGER_TYPE) {
|
||||||
return new Integer(this.dataIn.readInt()).toString();
|
return Integer.toString(this.dataIn.readInt());
|
||||||
}
|
}
|
||||||
if (type == MarshallingSupport.SHORT_TYPE) {
|
if (type == MarshallingSupport.SHORT_TYPE) {
|
||||||
return new Short(this.dataIn.readShort()).toString();
|
return Short.toString(this.dataIn.readShort());
|
||||||
}
|
}
|
||||||
if (type == MarshallingSupport.BYTE_TYPE) {
|
if (type == MarshallingSupport.BYTE_TYPE) {
|
||||||
return new Byte(this.dataIn.readByte()).toString();
|
return Byte.toString(this.dataIn.readByte());
|
||||||
}
|
}
|
||||||
if (type == MarshallingSupport.FLOAT_TYPE) {
|
if (type == MarshallingSupport.FLOAT_TYPE) {
|
||||||
return new Float(this.dataIn.readFloat()).toString();
|
return Float.toString(this.dataIn.readFloat());
|
||||||
}
|
}
|
||||||
if (type == MarshallingSupport.DOUBLE_TYPE) {
|
if (type == MarshallingSupport.DOUBLE_TYPE) {
|
||||||
return new Double(this.dataIn.readDouble()).toString();
|
return Double.toString(this.dataIn.readDouble());
|
||||||
}
|
}
|
||||||
if (type == MarshallingSupport.BOOLEAN_TYPE) {
|
if (type == MarshallingSupport.BOOLEAN_TYPE) {
|
||||||
return (this.dataIn.readBoolean() ? Boolean.TRUE : Boolean.FALSE).toString();
|
return (this.dataIn.readBoolean() ? Boolean.TRUE : Boolean.FALSE).toString();
|
||||||
}
|
}
|
||||||
if (type == MarshallingSupport.CHAR_TYPE) {
|
if (type == MarshallingSupport.CHAR_TYPE) {
|
||||||
return new Character(this.dataIn.readChar()).toString();
|
return Character.toString(this.dataIn.readChar());
|
||||||
} else {
|
} else {
|
||||||
this.dataIn.reset();
|
this.dataIn.reset();
|
||||||
throw new MessageFormatException(" not a String type");
|
throw new MessageFormatException(" not a String type");
|
||||||
|
@ -820,10 +820,10 @@ public class ActiveMQStreamMessage extends ActiveMQMessage implements StreamMess
|
||||||
return Byte.valueOf(this.dataIn.readByte());
|
return Byte.valueOf(this.dataIn.readByte());
|
||||||
}
|
}
|
||||||
if (type == MarshallingSupport.FLOAT_TYPE) {
|
if (type == MarshallingSupport.FLOAT_TYPE) {
|
||||||
return new Float(this.dataIn.readFloat());
|
return Float.valueOf(this.dataIn.readFloat());
|
||||||
}
|
}
|
||||||
if (type == MarshallingSupport.DOUBLE_TYPE) {
|
if (type == MarshallingSupport.DOUBLE_TYPE) {
|
||||||
return new Double(this.dataIn.readDouble());
|
return Double.valueOf(this.dataIn.readDouble());
|
||||||
}
|
}
|
||||||
if (type == MarshallingSupport.BOOLEAN_TYPE) {
|
if (type == MarshallingSupport.BOOLEAN_TYPE) {
|
||||||
return this.dataIn.readBoolean() ? Boolean.TRUE : Boolean.FALSE;
|
return this.dataIn.readBoolean() ? Boolean.TRUE : Boolean.FALSE;
|
||||||
|
|
|
@ -285,7 +285,7 @@ public class WireFormatInfo implements Command, MarshallAware {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setMaxInactivityDuration(long maxInactivityDuration) throws IOException {
|
public void setMaxInactivityDuration(long maxInactivityDuration) throws IOException {
|
||||||
setProperty("MaxInactivityDuration", new Long(maxInactivityDuration));
|
setProperty("MaxInactivityDuration", Long.valueOf(maxInactivityDuration));
|
||||||
}
|
}
|
||||||
|
|
||||||
public long getMaxInactivityDurationInitalDelay() throws IOException {
|
public long getMaxInactivityDurationInitalDelay() throws IOException {
|
||||||
|
@ -294,7 +294,7 @@ public class WireFormatInfo implements Command, MarshallAware {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setMaxInactivityDurationInitalDelay(long maxInactivityDurationInitalDelay) throws IOException {
|
public void setMaxInactivityDurationInitalDelay(long maxInactivityDurationInitalDelay) throws IOException {
|
||||||
setProperty("MaxInactivityDurationInitalDelay", new Long(maxInactivityDurationInitalDelay));
|
setProperty("MaxInactivityDurationInitalDelay", Long.valueOf(maxInactivityDurationInitalDelay));
|
||||||
}
|
}
|
||||||
|
|
||||||
public long getMaxFrameSize() throws IOException {
|
public long getMaxFrameSize() throws IOException {
|
||||||
|
@ -303,7 +303,7 @@ public class WireFormatInfo implements Command, MarshallAware {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setMaxFrameSize(long maxFrameSize) throws IOException {
|
public void setMaxFrameSize(long maxFrameSize) throws IOException {
|
||||||
setProperty("MaxFrameSize", new Long(maxFrameSize));
|
setProperty("MaxFrameSize", Long.valueOf(maxFrameSize));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -315,7 +315,7 @@ public class WireFormatInfo implements Command, MarshallAware {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setCacheSize(int cacheSize) throws IOException {
|
public void setCacheSize(int cacheSize) throws IOException {
|
||||||
setProperty("CacheSize", new Integer(cacheSize));
|
setProperty("CacheSize", Integer.valueOf(cacheSize));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -17,7 +17,6 @@
|
||||||
package org.apache.activemq.filter;
|
package org.apache.activemq.filter;
|
||||||
|
|
||||||
import java.lang.IllegalStateException;
|
import java.lang.IllegalStateException;
|
||||||
import javax.jms.*;
|
|
||||||
import org.apache.activemq.command.ActiveMQDestination;
|
import org.apache.activemq.command.ActiveMQDestination;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -122,42 +122,42 @@ public abstract class ArithmeticExpression extends BinaryExpression {
|
||||||
protected Number plus(Number left, Number right) {
|
protected Number plus(Number left, Number right) {
|
||||||
switch (numberType(left, right)) {
|
switch (numberType(left, right)) {
|
||||||
case INTEGER:
|
case INTEGER:
|
||||||
return new Integer(left.intValue() + right.intValue());
|
return Integer.valueOf(left.intValue() + right.intValue());
|
||||||
case LONG:
|
case LONG:
|
||||||
return new Long(left.longValue() + right.longValue());
|
return Long.valueOf(left.longValue() + right.longValue());
|
||||||
default:
|
default:
|
||||||
return new Double(left.doubleValue() + right.doubleValue());
|
return Double.valueOf(left.doubleValue() + right.doubleValue());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected Number minus(Number left, Number right) {
|
protected Number minus(Number left, Number right) {
|
||||||
switch (numberType(left, right)) {
|
switch (numberType(left, right)) {
|
||||||
case INTEGER:
|
case INTEGER:
|
||||||
return new Integer(left.intValue() - right.intValue());
|
return Integer.valueOf(left.intValue() - right.intValue());
|
||||||
case LONG:
|
case LONG:
|
||||||
return new Long(left.longValue() - right.longValue());
|
return Long.valueOf(left.longValue() - right.longValue());
|
||||||
default:
|
default:
|
||||||
return new Double(left.doubleValue() - right.doubleValue());
|
return Double.valueOf(left.doubleValue() - right.doubleValue());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected Number multiply(Number left, Number right) {
|
protected Number multiply(Number left, Number right) {
|
||||||
switch (numberType(left, right)) {
|
switch (numberType(left, right)) {
|
||||||
case INTEGER:
|
case INTEGER:
|
||||||
return new Integer(left.intValue() * right.intValue());
|
return Integer.valueOf(left.intValue() * right.intValue());
|
||||||
case LONG:
|
case LONG:
|
||||||
return new Long(left.longValue() * right.longValue());
|
return Long.valueOf(left.longValue() * right.longValue());
|
||||||
default:
|
default:
|
||||||
return new Double(left.doubleValue() * right.doubleValue());
|
return Double.valueOf(left.doubleValue() * right.doubleValue());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected Number divide(Number left, Number right) {
|
protected Number divide(Number left, Number right) {
|
||||||
return new Double(left.doubleValue() / right.doubleValue());
|
return Double.valueOf(left.doubleValue() / right.doubleValue());
|
||||||
}
|
}
|
||||||
|
|
||||||
protected Number mod(Number left, Number right) {
|
protected Number mod(Number left, Number right) {
|
||||||
return new Double(left.doubleValue() % right.doubleValue());
|
return Double.valueOf(left.doubleValue() % right.doubleValue());
|
||||||
}
|
}
|
||||||
|
|
||||||
private int numberType(Number left, Number right) {
|
private int numberType(Number left, Number right) {
|
||||||
|
|
|
@ -116,7 +116,7 @@ public abstract class ComparisonExpression extends BinaryExpression implements B
|
||||||
regexp.append(".*?"); // Do a non-greedy match
|
regexp.append(".*?"); // Do a non-greedy match
|
||||||
} else if (c == '_') {
|
} else if (c == '_') {
|
||||||
regexp.append("."); // match one
|
regexp.append("."); // match one
|
||||||
} else if (REGEXP_CONTROL_CHARS.contains(new Character(c))) {
|
} else if (REGEXP_CONTROL_CHARS.contains(Character.valueOf(c))) {
|
||||||
regexp.append("\\x");
|
regexp.append("\\x");
|
||||||
regexp.append(Integer.toHexString(0xFFFF & c));
|
regexp.append(Integer.toHexString(0xFFFF & c));
|
||||||
} else {
|
} else {
|
||||||
|
@ -387,9 +387,9 @@ public abstract class ComparisonExpression extends BinaryExpression implements B
|
||||||
} else if (rc == Long.class) {
|
} else if (rc == Long.class) {
|
||||||
lv = Long.valueOf(((Number)lv).longValue());
|
lv = Long.valueOf(((Number)lv).longValue());
|
||||||
} else if (rc == Float.class) {
|
} else if (rc == Float.class) {
|
||||||
lv = new Float(((Number)lv).floatValue());
|
lv = Float.valueOf(((Number)lv).floatValue());
|
||||||
} else if (rc == Double.class) {
|
} else if (rc == Double.class) {
|
||||||
lv = new Double(((Number)lv).doubleValue());
|
lv = Double.valueOf(((Number)lv).doubleValue());
|
||||||
} else if (convertStringExpressions && rc == String.class) {
|
} else if (convertStringExpressions && rc == String.class) {
|
||||||
rv = Byte.valueOf((String)rv);
|
rv = Byte.valueOf((String)rv);
|
||||||
} else {
|
} else {
|
||||||
|
@ -401,9 +401,9 @@ public abstract class ComparisonExpression extends BinaryExpression implements B
|
||||||
} else if (rc == Long.class) {
|
} else if (rc == Long.class) {
|
||||||
lv = Long.valueOf(((Number)lv).longValue());
|
lv = Long.valueOf(((Number)lv).longValue());
|
||||||
} else if (rc == Float.class) {
|
} else if (rc == Float.class) {
|
||||||
lv = new Float(((Number)lv).floatValue());
|
lv = Float.valueOf(((Number)lv).floatValue());
|
||||||
} else if (rc == Double.class) {
|
} else if (rc == Double.class) {
|
||||||
lv = new Double(((Number)lv).doubleValue());
|
lv = Double.valueOf(((Number)lv).doubleValue());
|
||||||
} else if (convertStringExpressions && rc == String.class) {
|
} else if (convertStringExpressions && rc == String.class) {
|
||||||
rv = Short.valueOf((String)rv);
|
rv = Short.valueOf((String)rv);
|
||||||
} else {
|
} else {
|
||||||
|
@ -413,9 +413,9 @@ public abstract class ComparisonExpression extends BinaryExpression implements B
|
||||||
if (rc == Long.class) {
|
if (rc == Long.class) {
|
||||||
lv = Long.valueOf(((Number)lv).longValue());
|
lv = Long.valueOf(((Number)lv).longValue());
|
||||||
} else if (rc == Float.class) {
|
} else if (rc == Float.class) {
|
||||||
lv = new Float(((Number)lv).floatValue());
|
lv = Float.valueOf(((Number)lv).floatValue());
|
||||||
} else if (rc == Double.class) {
|
} else if (rc == Double.class) {
|
||||||
lv = new Double(((Number)lv).doubleValue());
|
lv = Double.valueOf(((Number)lv).doubleValue());
|
||||||
} else if (convertStringExpressions && rc == String.class) {
|
} else if (convertStringExpressions && rc == String.class) {
|
||||||
rv = Integer.valueOf((String)rv);
|
rv = Integer.valueOf((String)rv);
|
||||||
} else {
|
} else {
|
||||||
|
@ -425,9 +425,9 @@ public abstract class ComparisonExpression extends BinaryExpression implements B
|
||||||
if (rc == Integer.class) {
|
if (rc == Integer.class) {
|
||||||
rv = Long.valueOf(((Number)rv).longValue());
|
rv = Long.valueOf(((Number)rv).longValue());
|
||||||
} else if (rc == Float.class) {
|
} else if (rc == Float.class) {
|
||||||
lv = new Float(((Number)lv).floatValue());
|
lv = Float.valueOf(((Number)lv).floatValue());
|
||||||
} else if (rc == Double.class) {
|
} else if (rc == Double.class) {
|
||||||
lv = new Double(((Number)lv).doubleValue());
|
lv = Double.valueOf(((Number)lv).doubleValue());
|
||||||
} else if (convertStringExpressions && rc == String.class) {
|
} else if (convertStringExpressions && rc == String.class) {
|
||||||
rv = Long.valueOf((String)rv);
|
rv = Long.valueOf((String)rv);
|
||||||
} else {
|
} else {
|
||||||
|
@ -435,11 +435,11 @@ public abstract class ComparisonExpression extends BinaryExpression implements B
|
||||||
}
|
}
|
||||||
} else if (lc == Float.class) {
|
} else if (lc == Float.class) {
|
||||||
if (rc == Integer.class) {
|
if (rc == Integer.class) {
|
||||||
rv = new Float(((Number)rv).floatValue());
|
rv = Float.valueOf(((Number)rv).floatValue());
|
||||||
} else if (rc == Long.class) {
|
} else if (rc == Long.class) {
|
||||||
rv = new Float(((Number)rv).floatValue());
|
rv = Float.valueOf(((Number)rv).floatValue());
|
||||||
} else if (rc == Double.class) {
|
} else if (rc == Double.class) {
|
||||||
lv = new Double(((Number)lv).doubleValue());
|
lv = Double.valueOf(((Number)lv).doubleValue());
|
||||||
} else if (convertStringExpressions && rc == String.class) {
|
} else if (convertStringExpressions && rc == String.class) {
|
||||||
rv = Float.valueOf((String)rv);
|
rv = Float.valueOf((String)rv);
|
||||||
} else {
|
} else {
|
||||||
|
@ -447,9 +447,9 @@ public abstract class ComparisonExpression extends BinaryExpression implements B
|
||||||
}
|
}
|
||||||
} else if (lc == Double.class) {
|
} else if (lc == Double.class) {
|
||||||
if (rc == Integer.class) {
|
if (rc == Integer.class) {
|
||||||
rv = new Double(((Number)rv).doubleValue());
|
rv = Double.valueOf(((Number)rv).doubleValue());
|
||||||
} else if (rc == Long.class) {
|
} else if (rc == Long.class) {
|
||||||
rv = new Double(((Number)rv).doubleValue());
|
rv = Double.valueOf(((Number)rv).doubleValue());
|
||||||
} else if (rc == Float.class) {
|
} else if (rc == Float.class) {
|
||||||
rv = new Float(((Number)rv).doubleValue());
|
rv = new Float(((Number)rv).doubleValue());
|
||||||
} else if (convertStringExpressions && rc == String.class) {
|
} else if (convertStringExpressions && rc == String.class) {
|
||||||
|
|
|
@ -57,7 +57,7 @@ public class ConstantExpression implements Expression {
|
||||||
|
|
||||||
Number value;
|
Number value;
|
||||||
try {
|
try {
|
||||||
value = new Long(text);
|
value = Long.valueOf(text);
|
||||||
} catch (NumberFormatException e) {
|
} catch (NumberFormatException e) {
|
||||||
// The number may be too big to fit in a long.
|
// The number may be too big to fit in a long.
|
||||||
value = new BigDecimal(text);
|
value = new BigDecimal(text);
|
||||||
|
@ -89,7 +89,7 @@ public class ConstantExpression implements Expression {
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ConstantExpression createFloat(String text) {
|
public static ConstantExpression createFloat(String text) {
|
||||||
Number value = new Double(text);
|
Number value = Double.valueOf(text);
|
||||||
return new ConstantExpression(value);
|
return new ConstantExpression(value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -157,7 +157,7 @@ public class PropertyExpression implements Expression {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Object evaluate(Message message) {
|
public Object evaluate(Message message) {
|
||||||
return new Integer(message.getGroupSequence());
|
return Integer.valueOf(message.getGroupSequence());
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
JMS_PROPERTY_EXPRESSIONS.put("JMSXProducerTXID", new SubExpression() {
|
JMS_PROPERTY_EXPRESSIONS.put("JMSXProducerTXID", new SubExpression() {
|
||||||
|
|
|
@ -181,13 +181,13 @@ public abstract class UnaryExpression implements Expression {
|
||||||
private static Number negate(Number left) {
|
private static Number negate(Number left) {
|
||||||
Class clazz = left.getClass();
|
Class clazz = left.getClass();
|
||||||
if (clazz == Integer.class) {
|
if (clazz == Integer.class) {
|
||||||
return new Integer(-left.intValue());
|
return Integer.valueOf(-left.intValue());
|
||||||
} else if (clazz == Long.class) {
|
} else if (clazz == Long.class) {
|
||||||
return new Long(-left.longValue());
|
return Long.valueOf(-left.longValue());
|
||||||
} else if (clazz == Float.class) {
|
} else if (clazz == Float.class) {
|
||||||
return new Float(-left.floatValue());
|
return Float.valueOf(-left.floatValue());
|
||||||
} else if (clazz == Double.class) {
|
} else if (clazz == Double.class) {
|
||||||
return new Double(-left.doubleValue());
|
return Double.valueOf(-left.doubleValue());
|
||||||
} else if (clazz == BigDecimal.class) {
|
} else if (clazz == BigDecimal.class) {
|
||||||
// We ussually get a big deciamal when we have Long.MIN_VALUE
|
// We ussually get a big deciamal when we have Long.MIN_VALUE
|
||||||
// constant in the
|
// constant in the
|
||||||
|
|
|
@ -520,13 +520,13 @@ public final class OpenWireFormat implements WireFormat {
|
||||||
// We can only cache that item if there is space left.
|
// We can only cache that item if there is space left.
|
||||||
if (marshallCacheMap.size() < marshallCache.length) {
|
if (marshallCacheMap.size() < marshallCache.length) {
|
||||||
marshallCache[i] = o;
|
marshallCache[i] = o;
|
||||||
Short index = new Short(i);
|
Short index = Short.valueOf(i);
|
||||||
marshallCacheMap.put(o, index);
|
marshallCacheMap.put(o, index);
|
||||||
return index;
|
return index;
|
||||||
} else {
|
} else {
|
||||||
// Use -1 to indicate that the value was not cached due to cache
|
// Use -1 to indicate that the value was not cached due to cache
|
||||||
// being full.
|
// being full.
|
||||||
return new Short((short)-1);
|
return Short.valueOf((short)-1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -201,7 +201,7 @@ public abstract class BaseDataStreamMarshaller implements DataStreamMarshaller {
|
||||||
.newInstance(new Object[] {tightUnmarshalString(dataIn, bs),
|
.newInstance(new Object[] {tightUnmarshalString(dataIn, bs),
|
||||||
tightUnmarshalString(dataIn, bs),
|
tightUnmarshalString(dataIn, bs),
|
||||||
tightUnmarshalString(dataIn, bs),
|
tightUnmarshalString(dataIn, bs),
|
||||||
new Integer(dataIn.readInt())});
|
Integer.valueOf(dataIn.readInt())});
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
throw e;
|
throw e;
|
||||||
} catch (Throwable e) {
|
} catch (Throwable e) {
|
||||||
|
@ -522,7 +522,7 @@ public abstract class BaseDataStreamMarshaller implements DataStreamMarshaller {
|
||||||
.newInstance(new Object[] {looseUnmarshalString(dataIn),
|
.newInstance(new Object[] {looseUnmarshalString(dataIn),
|
||||||
looseUnmarshalString(dataIn),
|
looseUnmarshalString(dataIn),
|
||||||
looseUnmarshalString(dataIn),
|
looseUnmarshalString(dataIn),
|
||||||
new Integer(dataIn.readInt())});
|
Integer.valueOf(dataIn.readInt())});
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
throw e;
|
throw e;
|
||||||
} catch (Throwable e) {
|
} catch (Throwable e) {
|
||||||
|
|
|
@ -20,7 +20,6 @@ package org.apache.activemq.state;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
|
@ -23,4 +23,6 @@ import java.io.IOException;
|
||||||
* a reply or response is received
|
* a reply or response is received
|
||||||
*/
|
*/
|
||||||
public class RequestTimedOutIOException extends IOException {
|
public class RequestTimedOutIOException extends IOException {
|
||||||
|
|
||||||
|
private static final long serialVersionUID = -5938342624821415513L;
|
||||||
}
|
}
|
||||||
|
|
|
@ -69,7 +69,7 @@ public class ResponseCorrelator extends TransportFilter {
|
||||||
synchronized (requestMap) {
|
synchronized (requestMap) {
|
||||||
priorError = this.error;
|
priorError = this.error;
|
||||||
if (priorError == null) {
|
if (priorError == null) {
|
||||||
requestMap.put(new Integer(command.getCommandId()), future);
|
requestMap.put(Integer.valueOf(command.getCommandId()), future);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -18,8 +18,6 @@ package org.apache.activemq.transport.discovery;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
import javax.jms.JMSException;
|
|
||||||
|
|
||||||
import org.apache.activemq.Service;
|
import org.apache.activemq.Service;
|
||||||
import org.apache.activemq.command.DiscoveryEvent;
|
import org.apache.activemq.command.DiscoveryEvent;
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,6 @@ package org.apache.activemq.transport.failover;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.net.URI;
|
import java.net.URI;
|
||||||
import java.net.URISyntaxException;
|
import java.net.URISyntaxException;
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import org.apache.activemq.transport.MutexTransport;
|
import org.apache.activemq.transport.MutexTransport;
|
||||||
import org.apache.activemq.transport.ResponseCorrelator;
|
import org.apache.activemq.transport.ResponseCorrelator;
|
||||||
|
|
|
@ -115,7 +115,7 @@ public class FanoutTransport implements CompositeTransport {
|
||||||
public void onCommand(Object o) {
|
public void onCommand(Object o) {
|
||||||
Command command = (Command) o;
|
Command command = (Command) o;
|
||||||
if (command.isResponse()) {
|
if (command.isResponse()) {
|
||||||
Integer id = new Integer(((Response) command).getCorrelationId());
|
Integer id = Integer.valueOf(((Response) command).getCorrelationId());
|
||||||
RequestCounter rc = requestMap.get(id);
|
RequestCounter rc = requestMap.get(id);
|
||||||
if (rc != null) {
|
if (rc != null) {
|
||||||
if (rc.ackCount.decrementAndGet() <= 0) {
|
if (rc.ackCount.decrementAndGet() <= 0) {
|
||||||
|
@ -403,7 +403,7 @@ public class FanoutTransport implements CompositeTransport {
|
||||||
boolean fanout = isFanoutCommand(command);
|
boolean fanout = isFanoutCommand(command);
|
||||||
if (stateTracker.track(command) == null && command.isResponseRequired()) {
|
if (stateTracker.track(command) == null && command.isResponseRequired()) {
|
||||||
int size = fanout ? minAckCount : 1;
|
int size = fanout ? minAckCount : 1;
|
||||||
requestMap.put(new Integer(command.getCommandId()), new RequestCounter(command, size));
|
requestMap.put(Integer.valueOf(command.getCommandId()), new RequestCounter(command, size));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Send the message.
|
// Send the message.
|
||||||
|
|
|
@ -19,7 +19,6 @@ package org.apache.activemq.transport.fanout;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.net.URI;
|
import java.net.URI;
|
||||||
import java.net.URISyntaxException;
|
import java.net.URISyntaxException;
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import org.apache.activemq.transport.MutexTransport;
|
import org.apache.activemq.transport.MutexTransport;
|
||||||
|
|
|
@ -184,10 +184,10 @@ public final class MarshallingSupport {
|
||||||
value = Long.valueOf(in.readLong());
|
value = Long.valueOf(in.readLong());
|
||||||
break;
|
break;
|
||||||
case FLOAT_TYPE:
|
case FLOAT_TYPE:
|
||||||
value = new Float(in.readFloat());
|
value = Float.valueOf(in.readFloat());
|
||||||
break;
|
break;
|
||||||
case DOUBLE_TYPE:
|
case DOUBLE_TYPE:
|
||||||
value = new Double(in.readDouble());
|
value = Double.valueOf(in.readDouble());
|
||||||
break;
|
break;
|
||||||
case BYTE_ARRAY_TYPE:
|
case BYTE_ARRAY_TYPE:
|
||||||
value = new byte[in.readInt()];
|
value = new byte[in.readInt()];
|
||||||
|
|
|
@ -178,7 +178,7 @@ public final class TypeConversionSupport {
|
||||||
CONVERSION_MAP.put(new ConversionKey(Float.class, Double.class), new Converter() {
|
CONVERSION_MAP.put(new ConversionKey(Float.class, Double.class), new Converter() {
|
||||||
@Override
|
@Override
|
||||||
public Object convert(Object value) {
|
public Object convert(Object value) {
|
||||||
return new Double(((Number)value).doubleValue());
|
return Double.valueOf(((Number)value).doubleValue());
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
CONVERSION_MAP.put(new ConversionKey(String.class, ActiveMQDestination.class), new Converter() {
|
CONVERSION_MAP.put(new ConversionKey(String.class, ActiveMQDestination.class), new Converter() {
|
||||||
|
|
|
@ -321,7 +321,7 @@ public class ClassLoadingAwareObjectInputStreamTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Replace the filtered type and try again
|
// Replace the filtered type and try again
|
||||||
value[3] = new Integer(20);
|
value[3] = Integer.valueOf(20);
|
||||||
|
|
||||||
serialized = serializeObject(value);
|
serialized = serializeObject(value);
|
||||||
|
|
||||||
|
|
|
@ -29,7 +29,7 @@ public class LRUCacheTest {
|
||||||
public void testResize() throws Exception {
|
public void testResize() throws Exception {
|
||||||
LRUCache<Long, Long> underTest = new LRUCache<Long, Long>(1000);
|
LRUCache<Long, Long> underTest = new LRUCache<Long, Long>(1000);
|
||||||
|
|
||||||
Long count = new Long(0);
|
Long count = Long.valueOf(0);
|
||||||
long max = 0;
|
long max = 0;
|
||||||
for (; count < 27276827; count++) {
|
for (; count < 27276827; count++) {
|
||||||
long start = System.currentTimeMillis();
|
long start = System.currentTimeMillis();
|
||||||
|
|
|
@ -187,7 +187,7 @@ public class HttpJMSMessagesWithCompressionTest {
|
||||||
@Test
|
@Test
|
||||||
public void testObjectMessage() throws Exception {
|
public void testObjectMessage() throws Exception {
|
||||||
executeTest(new MessageCommand<ObjectMessage>() {
|
executeTest(new MessageCommand<ObjectMessage>() {
|
||||||
private Long value = new Long(101);
|
private Long value = Long.valueOf(101);
|
||||||
|
|
||||||
public ObjectMessage createMessage(Session session) throws JMSException {
|
public ObjectMessage createMessage(Session session) throws JMSException {
|
||||||
return session.createObjectMessage(value);
|
return session.createObjectMessage(value);
|
||||||
|
@ -202,7 +202,7 @@ public class HttpJMSMessagesWithCompressionTest {
|
||||||
@Test
|
@Test
|
||||||
public void testStreamMessage() throws Exception {
|
public void testStreamMessage() throws Exception {
|
||||||
executeTest(new MessageCommand<StreamMessage>() {
|
executeTest(new MessageCommand<StreamMessage>() {
|
||||||
private Long value = new Long(1013);
|
private Long value = Long.valueOf(1013);
|
||||||
|
|
||||||
public StreamMessage createMessage(Session session) throws JMSException {
|
public StreamMessage createMessage(Session session) throws JMSException {
|
||||||
StreamMessage message = session.createStreamMessage();
|
StreamMessage message = session.createStreamMessage();
|
||||||
|
|
|
@ -109,7 +109,7 @@ public class PooledConnectionFactoryMaximumActiveTest extends JmsPoolTestSupport
|
||||||
|
|
||||||
if (PooledConnectionFactoryMaximumActiveTest.conn == null) {
|
if (PooledConnectionFactoryMaximumActiveTest.conn == null) {
|
||||||
TASK_LOG.error("Connection not yet initialized. Aborting test.");
|
TASK_LOG.error("Connection not yet initialized. Aborting test.");
|
||||||
return new Boolean(false);
|
return Boolean.FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
one = PooledConnectionFactoryMaximumActiveTest.conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
|
one = PooledConnectionFactoryMaximumActiveTest.conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
|
||||||
|
@ -118,7 +118,7 @@ public class PooledConnectionFactoryMaximumActiveTest extends JmsPoolTestSupport
|
||||||
Thread.sleep(2 * PooledConnectionFactoryMaximumActiveTest.sleepTimeout);
|
Thread.sleep(2 * PooledConnectionFactoryMaximumActiveTest.sleepTimeout);
|
||||||
} catch (Exception ex) {
|
} catch (Exception ex) {
|
||||||
TASK_LOG.error(ex.getMessage());
|
TASK_LOG.error(ex.getMessage());
|
||||||
return new Boolean(false);
|
return Boolean.FALSE;
|
||||||
} finally {
|
} finally {
|
||||||
if (one != null)
|
if (one != null)
|
||||||
try {
|
try {
|
||||||
|
@ -129,7 +129,7 @@ public class PooledConnectionFactoryMaximumActiveTest extends JmsPoolTestSupport
|
||||||
}
|
}
|
||||||
|
|
||||||
// all good, test succeeded
|
// all good, test succeeded
|
||||||
return new Boolean(true);
|
return Boolean.TRUE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -381,14 +381,14 @@ public class PooledConnectionFactoryTest extends JmsPoolTestSupport {
|
||||||
fail("seconds call to Connection.createSession() was supposed" +
|
fail("seconds call to Connection.createSession() was supposed" +
|
||||||
"to raise an JMSException as internal session pool" +
|
"to raise an JMSException as internal session pool" +
|
||||||
"is exhausted. This did not happen and indiates a problem");
|
"is exhausted. This did not happen and indiates a problem");
|
||||||
return new Boolean(false);
|
return Boolean.FALSE;
|
||||||
} catch (JMSException ex) {
|
} catch (JMSException ex) {
|
||||||
if (ex.getCause().getClass() == java.util.NoSuchElementException.class) {
|
if (ex.getCause().getClass() == java.util.NoSuchElementException.class) {
|
||||||
// expected, ignore but log
|
// expected, ignore but log
|
||||||
LOG.info("Caught expected " + ex);
|
LOG.info("Caught expected " + ex);
|
||||||
} else {
|
} else {
|
||||||
LOG.error(ex);
|
LOG.error(ex);
|
||||||
return new Boolean(false);
|
return Boolean.FALSE;
|
||||||
}
|
}
|
||||||
} finally {
|
} finally {
|
||||||
if (one != null) {
|
if (one != null) {
|
||||||
|
@ -400,7 +400,7 @@ public class PooledConnectionFactoryTest extends JmsPoolTestSupport {
|
||||||
}
|
}
|
||||||
} catch (Exception ex) {
|
} catch (Exception ex) {
|
||||||
LOG.error(ex.getMessage());
|
LOG.error(ex.getMessage());
|
||||||
return new Boolean(false);
|
return Boolean.FALSE;
|
||||||
} finally {
|
} finally {
|
||||||
if (cf != null) {
|
if (cf != null) {
|
||||||
cf.stop();
|
cf.stop();
|
||||||
|
@ -408,7 +408,7 @@ public class PooledConnectionFactoryTest extends JmsPoolTestSupport {
|
||||||
}
|
}
|
||||||
|
|
||||||
// all good, test succeeded
|
// all good, test succeeded
|
||||||
return new Boolean(true);
|
return Boolean.FALSE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -3866,7 +3866,7 @@ public abstract class MessageDatabase extends ServiceSupport implements BrokerSe
|
||||||
|
|
||||||
void setBatch(Transaction tx, Long sequence) throws IOException {
|
void setBatch(Transaction tx, Long sequence) throws IOException {
|
||||||
if (sequence != null) {
|
if (sequence != null) {
|
||||||
Long nextPosition = new Long(sequence.longValue() + 1);
|
Long nextPosition = Long.valueOf(sequence.longValue() + 1);
|
||||||
lastDefaultKey = sequence;
|
lastDefaultKey = sequence;
|
||||||
cursor.defaultCursorPosition = nextPosition.longValue();
|
cursor.defaultCursorPosition = nextPosition.longValue();
|
||||||
lastHighKey = sequence;
|
lastHighKey = sequence;
|
||||||
|
|
|
@ -342,7 +342,7 @@ public class JournalCorruptionEofIndexRecoveryTest {
|
||||||
|
|
||||||
private void corruptLocation(Location toCorrupt) throws IOException {
|
private void corruptLocation(Location toCorrupt) throws IOException {
|
||||||
|
|
||||||
DataFile dataFile = ((KahaDBPersistenceAdapter) broker.getPersistenceAdapter()).getStore().getJournal().getFileMap().get(new Integer(toCorrupt.getDataFileId()));
|
DataFile dataFile = ((KahaDBPersistenceAdapter) broker.getPersistenceAdapter()).getStore().getJournal().getFileMap().get(Integer.valueOf(toCorrupt.getDataFileId()));
|
||||||
|
|
||||||
RecoverableRandomAccessFile randomAccessFile = dataFile.openRandomAccessFile();
|
RecoverableRandomAccessFile randomAccessFile = dataFile.openRandomAccessFile();
|
||||||
|
|
||||||
|
|
|
@ -82,16 +82,16 @@ public class JMSMemtest {
|
||||||
|
|
||||||
public JMSMemtest(Properties settings) {
|
public JMSMemtest(Properties settings) {
|
||||||
url = settings.getProperty("url");
|
url = settings.getProperty("url");
|
||||||
topic = new Boolean(settings.getProperty("topic")).booleanValue();
|
topic = Boolean.parseBoolean(settings.getProperty("topic"));
|
||||||
durable = new Boolean(settings.getProperty("durable")).booleanValue();
|
durable = Boolean.parseBoolean(settings.getProperty("durable"));
|
||||||
connectionCheckpointSize = new Integer(settings.getProperty("connectionCheckpointSize")).intValue();
|
connectionCheckpointSize = Integer.valueOf(settings.getProperty("connectionCheckpointSize")).intValue();
|
||||||
producerCount = new Integer(settings.getProperty("producerCount")).intValue();
|
producerCount = Integer.valueOf(settings.getProperty("producerCount")).intValue();
|
||||||
consumerCount = new Integer(settings.getProperty("consumerCount")).intValue();
|
consumerCount = Integer.valueOf(settings.getProperty("consumerCount")).intValue();
|
||||||
messageCount = new Integer(settings.getProperty("messageCount")).intValue();
|
messageCount = Integer.valueOf(settings.getProperty("messageCount")).intValue();
|
||||||
messageSize = new Integer(settings.getProperty("messageSize")).intValue();
|
messageSize = Integer.valueOf(settings.getProperty("messageSize")).intValue();
|
||||||
prefetchSize = new Integer(settings.getProperty("prefetchSize")).intValue();
|
prefetchSize = Integer.valueOf(settings.getProperty("prefetchSize")).intValue();
|
||||||
checkpointInterval = new Integer(settings.getProperty("checkpointInterval")).intValue() * 1000;
|
checkpointInterval = Integer.valueOf(settings.getProperty("checkpointInterval")).intValue() * 1000;
|
||||||
producerCount = new Integer(settings.getProperty("producerCount")).intValue();
|
producerCount = Integer.valueOf(settings.getProperty("producerCount")).intValue();
|
||||||
reportName = settings.getProperty("reportName");
|
reportName = settings.getProperty("reportName");
|
||||||
destinationName = settings.getProperty("destinationName");
|
destinationName = settings.getProperty("destinationName");
|
||||||
reportDirectory = settings.getProperty("reportDirectory");
|
reportDirectory = settings.getProperty("reportDirectory");
|
||||||
|
@ -290,17 +290,17 @@ public class JMSMemtest {
|
||||||
Properties settings = new Properties();
|
Properties settings = new Properties();
|
||||||
settings.setProperty("domain", topic ? "topic" : "queue");
|
settings.setProperty("domain", topic ? "topic" : "queue");
|
||||||
settings.setProperty("durable", durable ? "durable" : "non-durable");
|
settings.setProperty("durable", durable ? "durable" : "non-durable");
|
||||||
settings.setProperty("connection_checkpoint_size_kb", new Integer(connectionCheckpointSize).toString());
|
settings.setProperty("connection_checkpoint_size_kb", Integer.valueOf(connectionCheckpointSize).toString());
|
||||||
settings.setProperty("producer_count", new Integer(producerCount).toString());
|
settings.setProperty("producer_count", Integer.valueOf(producerCount).toString());
|
||||||
settings.setProperty("consumer_count", new Integer(consumerCount).toString());
|
settings.setProperty("consumer_count", Integer.valueOf(consumerCount).toString());
|
||||||
settings.setProperty("message_count", new Long(messageCount).toString());
|
settings.setProperty("message_count", Long.valueOf(messageCount).toString());
|
||||||
settings.setProperty("message_size", new Integer(messageSize).toString());
|
settings.setProperty("message_size", Integer.valueOf(messageSize).toString());
|
||||||
settings.setProperty("prefetchSize", new Integer(prefetchSize).toString());
|
settings.setProperty("prefetchSize", Integer.valueOf(prefetchSize).toString());
|
||||||
settings.setProperty("checkpoint_interval", new Integer(checkpointInterval).toString());
|
settings.setProperty("checkpoint_interval", Integer.valueOf(checkpointInterval).toString());
|
||||||
settings.setProperty("destination_name", destinationName);
|
settings.setProperty("destination_name", destinationName);
|
||||||
settings.setProperty("report_name", reportName);
|
settings.setProperty("report_name", reportName);
|
||||||
settings.setProperty("report_directory", reportDirectory);
|
settings.setProperty("report_directory", reportDirectory);
|
||||||
settings.setProperty("connection_checkpoint_size", new Integer(connectionCheckpointSize).toString());
|
settings.setProperty("connection_checkpoint_size", Integer.valueOf(connectionCheckpointSize).toString());
|
||||||
return settings;
|
return settings;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -67,7 +67,7 @@ public class MemoryMonitoringTool implements Runnable {
|
||||||
public Thread startMonitor() {
|
public Thread startMonitor() {
|
||||||
|
|
||||||
String intervalStr = this.getTestSettings().getProperty("checkpoint_interval");
|
String intervalStr = this.getTestSettings().getProperty("checkpoint_interval");
|
||||||
checkpointInterval = new Integer(intervalStr).intValue();
|
checkpointInterval = Integer.valueOf(intervalStr).intValue();
|
||||||
this.getTestSettings().remove("checkpoint_interval");
|
this.getTestSettings().remove("checkpoint_interval");
|
||||||
|
|
||||||
memoryBean = ManagementFactory.getMemoryMXBean();
|
memoryBean = ManagementFactory.getMemoryMXBean();
|
||||||
|
|
|
@ -102,12 +102,12 @@ public class PortfolioPublishServlet extends MessageServletSupport {
|
||||||
protected String createStockText(String stock) {
|
protected String createStockText(String stock) {
|
||||||
Double value = LAST_PRICES.get(stock);
|
Double value = LAST_PRICES.get(stock);
|
||||||
if (value == null) {
|
if (value == null) {
|
||||||
value = new Double(Math.random() * 100);
|
value = Double.valueOf(Math.random() * 100);
|
||||||
}
|
}
|
||||||
|
|
||||||
// lets mutate the value by some percentage
|
// lets mutate the value by some percentage
|
||||||
double oldPrice = value.doubleValue();
|
double oldPrice = value.doubleValue();
|
||||||
value = new Double(mutatePrice(oldPrice));
|
value = Double.valueOf(mutatePrice(oldPrice));
|
||||||
LAST_PRICES.put(stock, value);
|
LAST_PRICES.put(stock, value);
|
||||||
double price = value.doubleValue();
|
double price = value.doubleValue();
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue