Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-3576 Fix toString methods throwing exceptions

This commit is contained in:
Domenico Francesco Bruscino 2021-12-03 18:21:39 +01:00 committed by clebertsuconic
parent 5730fcacfa
commit 3f7f8c0ecd
20 changed files with 235 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
artemis-commons/src/main/java/org/apache/activemq/artemis/json/impl/JsonArrayBuilderImpl.java
View File

@ -25,6 +25,8 @@ import org.apache.activemq.artemis.json.JsonValue;
import java.math.BigDecimal;
import java.math.BigInteger;
import static org.apache.activemq.artemis.utils.Preconditions.checkNotNull;
public class JsonArrayBuilderImpl implements JsonArrayBuilder {
private final javax.json.JsonArrayBuilder rawArrayBuilder;
@ -34,6 +36,7 @@ public class JsonArrayBuilderImpl implements JsonArrayBuilder {
}
public JsonArrayBuilderImpl(javax.json.JsonArrayBuilder rawArrayBuilder) {
checkNotNull(rawArrayBuilder);
this.rawArrayBuilder = rawArrayBuilder;
}

3
artemis-commons/src/main/java/org/apache/activemq/artemis/json/impl/JsonObjectBuilderImpl.java
View File

@ -25,6 +25,8 @@ import org.apache.activemq.artemis.json.JsonValue;
import java.math.BigDecimal;
import java.math.BigInteger;
import static org.apache.activemq.artemis.utils.Preconditions.checkNotNull;
public class JsonObjectBuilderImpl implements JsonObjectBuilder {
private final javax.json.JsonObjectBuilder rawObjectBuilder;
@ -34,6 +36,7 @@ public class JsonObjectBuilderImpl implements JsonObjectBuilder {
}
public JsonObjectBuilderImpl(javax.json.JsonObjectBuilder rawObjectBuilder) {
checkNotNull(rawObjectBuilder);
this.rawObjectBuilder = rawObjectBuilder;
}

3
artemis-commons/src/main/java/org/apache/activemq/artemis/json/impl/JsonValueImpl.java
View File

@ -24,6 +24,8 @@ import org.apache.activemq.artemis.json.JsonValue;
import java.util.HashMap;
import java.util.Map;
import static org.apache.activemq.artemis.utils.Preconditions.checkNotNull;
public class JsonValueImpl implements JsonValue {
private Map<javax.json.JsonValue, JsonValue> cache = new HashMap<>();
@ -77,6 +79,7 @@ public class JsonValueImpl implements JsonValue {
}
public JsonValueImpl(javax.json.JsonValue rawValue) {
checkNotNull(rawValue);
this.rawValue = rawValue;
}

4
artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnection.java
View File

@ -45,6 +45,8 @@ import org.apache.activemq.artemis.utils.Env;
import org.apache.activemq.artemis.utils.IPV6Util;
import org.jboss.logging.Logger;
import static org.apache.activemq.artemis.utils.Preconditions.checkNotNull;
public class NettyConnection implements Connection {
private static final Logger logger = Logger.getLogger(NettyConnection.class);
@ -74,6 +76,8 @@ public class NettyConnection implements Connection {
final BaseConnectionLifeCycleListener<?> listener,
boolean batchingEnabled,
boolean directDeliver) {
checkNotNull(channel);
this.configuration = configuration;
this.channel = channel;

7
artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java
View File

@ -54,6 +54,7 @@ import static org.apache.activemq.artemis.jms.client.ActiveMQDestination.QUEUE_Q
import static org.apache.activemq.artemis.jms.client.ActiveMQDestination.TEMP_QUEUE_QUALIFED_PREFIX;
import static org.apache.activemq.artemis.jms.client.ActiveMQDestination.TEMP_TOPIC_QUALIFED_PREFIX;
import static org.apache.activemq.artemis.jms.client.ActiveMQDestination.TOPIC_QUALIFIED_PREFIX;
import static org.apache.activemq.artemis.utils.Preconditions.checkNotNull;
/**
* ActiveMQ Artemis implementation of a JMS Message.
@ -219,6 +220,8 @@ public class ActiveMQMessage implements javax.jms.Message {
* Constructor for when receiving a message from the server
*/
public ActiveMQMessage(final ClientMessage message, final ClientSession session) {
checkNotNull(message);
this.message = message;
readOnly = true;
@ -853,10 +856,14 @@ public class ActiveMQMessage implements javax.jms.Message {
@Override
public String toString() {
StringBuffer sb = new StringBuffer("ActiveMQMessage[");
if (message != null) {
sb.append(getJMSMessageID());
sb.append("]:");
sb.append(message.isDurable() ? "PERSISTENT" : "NON-PERSISTENT");
sb.append("/" + message.toString());
} else {
sb.append("]");
}
return sb.toString();
}

4
artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalFileImpl.java
View File

@ -25,6 +25,8 @@ import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import org.apache.activemq.artemis.core.io.SequentialFile;
import org.jboss.logging.Logger;
import static org.apache.activemq.artemis.utils.Preconditions.checkNotNull;
public class JournalFileImpl implements JournalFile {
private final SequentialFile file;
@ -65,6 +67,8 @@ public class JournalFileImpl implements JournalFile {
private static final Logger logger = Logger.getLogger(JournalFileImpl.class);
public JournalFileImpl(final SequentialFile file, final long fileID, final int version) {
checkNotNull(file);
this.file = file;
this.fileID = fileID;

4
artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalRecord.java
View File

@ -16,6 +16,8 @@
*/
package org.apache.activemq.artemis.core.journal.impl;
import static org.apache.activemq.artemis.utils.Preconditions.checkNotNull;
/**
* This holds the relationship a record has with other files in regard to reference counting.
* Note: This class used to be called PosFiles
@ -35,6 +37,8 @@ public class JournalRecord {
private ObjIntIntArrayList<JournalFile> fileUpdates;
public JournalRecord(final JournalFile addFile, final int size) {
checkNotNull(addFile);
this.addFile = addFile;
this.size = size;

7
artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
View File

@ -1779,11 +1779,16 @@ public abstract class AMQPMessage extends RefCountMessage implements org.apache.
@Override
public String toString() {
MessageDataScanningStatus scanningStatus = getDataScanningStatus();
Map<String, Object> applicationProperties = scanningStatus == MessageDataScanningStatus.SCANNED ?
getApplicationPropertiesMap(false) : Collections.EMPTY_MAP;
return this.getClass().getSimpleName() + "( [durable=" + isDurable() +
", messageID=" + getMessageID() +
", address=" + getAddress() +
", size=" + getEncodeSize() +
", applicationProperties=" + getApplicationPropertiesMap(false) +
", scanningStatus=" + scanningStatus +
", applicationProperties=" + applicationProperties +
", messageAnnotations=" + getMessageAnnotationsMap(false) +
", properties=" + properties +
", extraProperties = " + getExtraProperties() +

4
artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/util/NettyReadable.java
View File

@ -26,6 +26,8 @@ import org.apache.qpid.proton.codec.WritableBuffer;
import io.netty.buffer.ByteBuf;
import static org.apache.activemq.artemis.utils.Preconditions.checkNotNull;
/**
* {@link ReadableBuffer} implementation that wraps a Netty {@link ByteBuf} to
* allow use of Netty buffers to be used when decoding AMQP messages.
@ -37,6 +39,8 @@ public class NettyReadable implements ReadableBuffer {
private final ByteBuf buffer;
public NettyReadable(ByteBuf buffer) {
checkNotNull(buffer);
this.buffer = buffer;
}

2
artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnectionFactory.java
View File

@ -332,7 +332,7 @@ public final class ActiveMQRAManagedConnectionFactory implements ManagedConnecti
}
int hash = mcfProperties.hashCode();
hash += 31 * ra.hashCode();
hash += 31 * (ra != null ? ra.hashCode() : 0);
return hash;
}

5
artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessage.java
View File

@ -22,6 +22,8 @@ import javax.jms.Message;
import java.util.Arrays;
import java.util.Enumeration;
import static org.apache.activemq.artemis.utils.Preconditions.checkNotNull;
/**
* A wrapper for a message
*/
@ -44,6 +46,9 @@ public class ActiveMQRAMessage implements Message {
* @param session the session
*/
public ActiveMQRAMessage(final Message message, final ActiveMQRASession session) {
checkNotNull(message);
checkNotNull(session);
if (ActiveMQRALogger.LOGGER.isTraceEnabled()) {
ActiveMQRALogger.LOGGER.trace("constructor(" + message + ", " + session + ")");
}

4
artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageReader.java
View File

@ -24,6 +24,8 @@ import org.apache.activemq.artemis.core.paging.cursor.PagePosition;
import org.apache.activemq.artemis.core.paging.impl.Page;
import org.jboss.logging.Logger;
import static org.apache.activemq.artemis.utils.Preconditions.checkNotNull;
public class PageReader implements PageCache {
private static final Logger logger = Logger.getLogger(PageReader.class);
@ -31,6 +33,8 @@ public class PageReader implements PageCache {
private final int numberOfMessages;
public PageReader(Page page, int numberOfMessages) {
checkNotNull(page);
this.page = page;
this.numberOfMessages = numberOfMessages;
}

7
artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/config/PersistedRole.java
View File

@ -24,6 +24,8 @@ import org.apache.activemq.artemis.core.journal.EncodingSupport;
import org.apache.activemq.artemis.utils.BufferHelper;
import org.apache.activemq.artemis.utils.DataConstants;
import static org.apache.activemq.artemis.utils.Preconditions.checkNotNull;
public class PersistedRole implements EncodingSupport {
private long storeId;
@ -36,6 +38,9 @@ public class PersistedRole implements EncodingSupport {
}
public PersistedRole(String username, List<String> roles) {
checkNotNull(username);
checkNotNull(roles);
this.username = username;
this.roles = roles;
}
@ -95,12 +100,14 @@ public class PersistedRole implements EncodingSupport {
result.append("PersistedRole [storeId=").append(storeId);
result.append(", username=").append(username);
result.append(", roles [");
if (roles != null) {
for (int i = 0; i < roles.size(); i++) {
result.append(roles.get(i));
if (i < roles.size() - 1) {
result.append(", ");
}
}
}
result.append("]]");
return result.toString();

7
artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/DuplicateIDEncoding.java
View File

@ -25,6 +25,8 @@ import org.apache.activemq.artemis.utils.ByteUtil;
import org.apache.activemq.artemis.utils.DataConstants;
import org.apache.activemq.artemis.utils.UUID;
import static org.apache.activemq.artemis.utils.Preconditions.checkNotNull;
public class DuplicateIDEncoding implements EncodingSupport {
public SimpleString address;
@ -32,6 +34,9 @@ public class DuplicateIDEncoding implements EncodingSupport {
public byte[] duplID;
public DuplicateIDEncoding(final SimpleString address, final byte[] duplID) {
checkNotNull(address);
checkNotNull(duplID);
this.address = address;
this.duplID = duplID;
@ -78,7 +83,7 @@ public class DuplicateIDEncoding implements EncodingSupport {
// The bridge will generate IDs on these terms:
// This will make them easier to read
if (address.toString().startsWith("BRIDGE") && duplID.length == 24) {
if (address != null && address.toString().startsWith("BRIDGE") && duplID.length == 24) {
try {
ByteBuffer buff = ByteBuffer.wrap(duplID);

5
artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PersistentAddressBindingEncoding.java
View File

@ -25,6 +25,8 @@ import org.apache.activemq.artemis.core.persistence.AddressBindingInfo;
import org.apache.activemq.artemis.api.core.RoutingType;
import org.apache.activemq.artemis.utils.DataConstants;
import static org.apache.activemq.artemis.utils.Preconditions.checkNotNull;
public class PersistentAddressBindingEncoding implements EncodingSupport, AddressBindingInfo {
public long id;
@ -59,6 +61,9 @@ public class PersistentAddressBindingEncoding implements EncodingSupport, Addres
public PersistentAddressBindingEncoding(final SimpleString name,
final EnumSet<RoutingType> routingTypes,
final boolean autoCreated) {
checkNotNull(name);
checkNotNull(routingTypes);
this.name = name;
this.routingTypes = routingTypes;
this.autoCreated = autoCreated;

2
artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java
View File

@ -125,7 +125,7 @@ class NullStorageLargeServerMessage extends CoreMessage implements CoreLargeServ
@Override
public String toString() {
return "NullStorageLargeServerMessage[messageID=" + messageID + ", durable=" + durable + ", address=" + getAddress() + ",properties=" + properties.toString() + "]";
return "NullStorageLargeServerMessage[messageID=" + messageID + ", durable=" + durable + ", address=" + getAddress() + ",properties=" + properties + "]";
}
@Override

7
artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/BackupReplicationStartFailedMessage.java
View File

@ -24,6 +24,8 @@ import java.util.Map;
import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl;
import static org.apache.activemq.artemis.utils.Preconditions.checkNotNull;
/**
* Informs the Backup trying to start replicating of an error.
*/
@ -57,6 +59,9 @@ public final class BackupReplicationStartFailedMessage extends PacketImpl {
public BackupReplicationStartFailedMessage(BackupRegistrationProblem registrationProblem) {
super(BACKUP_REGISTRATION_FAILED);
checkNotNull(registrationProblem);
problem = registrationProblem;
}
@ -104,6 +109,6 @@ public final class BackupReplicationStartFailedMessage extends PacketImpl {
@Override
protected String getPacketString() {
return super.getPacketString() + ", problem=" + problem.name();
return super.getPacketString() + ", problem=" + (problem != null ? problem.name() : null);
}
}

5
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/QuorumManager.java
View File

@ -42,6 +42,8 @@ import org.apache.activemq.artemis.core.server.ActiveMQServerLogger;
import org.apache.activemq.artemis.core.server.cluster.ClusterControl;
import org.apache.activemq.artemis.core.server.cluster.ClusterController;
import static org.apache.activemq.artemis.utils.Preconditions.checkNotNull;
/**
* A QourumManager can be used to register a {@link org.apache.activemq.artemis.core.server.cluster.qourum.Quorum} to receive notifications
* about changes to the cluster. A {@link org.apache.activemq.artemis.core.server.cluster.qourum.Quorum} can then issue a vote to the
@ -73,6 +75,9 @@ public final class QuorumManager implements ClusterTopologyListener, ActiveMQCom
private int maxClusterSize = 0;
public QuorumManager(ExecutorService threadPool, ClusterController clusterController) {
checkNotNull(threadPool);
checkNotNull(clusterController);
this.clusterController = clusterController;
this.executor = threadPool;
}

11
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/MessageReferenceImpl.java
View File

@ -319,11 +319,16 @@ public class MessageReferenceImpl extends LinkedListImpl.Node<MessageReferenceIm
@Override
public String toString() {
return "Reference[" + getMessage().getMessageID() +
Message message = getMessage();
if (message != null) {
return "Reference[" + message.getMessageID() +
"]:" +
(getMessage().isDurable() ? "RELIABLE" : "NON-RELIABLE") +
(message.isDurable() ? "RELIABLE" : "NON-RELIABLE") +
":" +
getMessage();
message;
} else {
return "Reference[]";
}
}
@Override

139
tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/AllClassesTest.java Normal file
View File

@ -0,0 +1,139 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.artemis.tests.unit;
import com.google.common.collect.ImmutableSet;
import com.google.common.reflect.ClassPath;
import org.apache.activemq.artemis.tests.util.RandomUtil;
import org.jboss.logging.Logger;
import org.junit.Assume;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import java.lang.reflect.Constructor;
import java.lang.reflect.Modifier;
import java.lang.reflect.Parameter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Comparator;
import java.util.List;
@RunWith(value = Parameterized.class)
public class AllClassesTest {
private static final Logger log = Logger.getLogger(AllClassesTest.class);
@Parameterized.Parameters(name = "classInfo={0}")
public static Collection getParameters() {
List<Class> parameters = new ArrayList<>();
ClassLoader classLoader = AllClassesTest.class.getClassLoader();
try {
ClassPath classPath = ClassPath.from(classLoader);
ImmutableSet<ClassPath.ClassInfo> classInfos = classPath.getTopLevelClassesRecursive("org.apache.activemq.artemis");
for (ClassPath.ClassInfo classInfo : classInfos) {
if (!classInfo.getPackageName().contains("tests")) {
try {
Class loadedClass = classInfo.load();
if (!loadedClass.isEnum() && !loadedClass.isInterface() && !Modifier.isAbstract(loadedClass.getModifiers())) {
parameters.add(loadedClass);
}
} catch (Throwable loadThrowable) {
log.debug("cannot load " + classInfo.getName() + ": " + loadThrowable);
}
}
}
parameters.sort(Comparator.comparing(Class::getName));
return parameters;
} catch (Exception e) {
log.warn("Exception on loading all classes: " + e);
}
return parameters;
}
private Class targetClass;
public AllClassesTest(Class targetClass) {
this.targetClass = targetClass;
}
@Test
public void testToString() {
Object targetInstance = null;
try {
targetInstance = newInstance(targetClass);
} catch (Throwable t) {
log.debug("Error creating a new instance of " + targetClass.getName() + ": " + t);
}
Assume.assumeTrue("Cannot create " + targetClass.getName(), targetInstance != null);
String targetOutput = targetInstance.toString();
log.debug("targetOutput: " + targetOutput);
}
private Object newInstance(Class targetClass) {
Constructor[] targetConstructors = targetClass.getDeclaredConstructors();
Arrays.sort(targetConstructors, (c1, c2) -> c2.getParameterCount() - c1.getParameterCount());
for (Constructor targetConstructor : targetConstructors) {
List<Object> initArgs = new ArrayList<>();
Parameter[] constructorParameters = targetConstructor.getParameters();
for (Parameter constructorParameter : constructorParameters) {
Object initArg;
if (constructorParameter.getType().isAssignableFrom(byte.class)) {
initArg = RandomUtil.randomByte();
} else if (constructorParameter.getType().isAssignableFrom(byte[].class)) {
initArg = RandomUtil.randomBytes();
} else if (constructorParameter.getType().isAssignableFrom(boolean.class)) {
initArg = RandomUtil.randomBoolean();
} else if (constructorParameter.getType().isAssignableFrom(char.class)) {
initArg = RandomUtil.randomChar();
} else if (constructorParameter.getType().isAssignableFrom(double.class)) {
initArg = RandomUtil.randomDouble();
} else if (constructorParameter.getType().isAssignableFrom(float.class)) {
initArg = RandomUtil.randomFloat();
} else if (constructorParameter.getType().isAssignableFrom(int.class)) {
initArg = RandomUtil.randomInt() / 1024;
} else if (constructorParameter.getType().isAssignableFrom(long.class)) {
initArg = RandomUtil.randomLong();
} else if (constructorParameter.getType().isAssignableFrom(String.class)) {
initArg = RandomUtil.randomString();
} else {
initArg = null;
}
initArgs.add(initArg);
}
try {
return targetConstructor.newInstance(initArgs.toArray());
} catch (Throwable t) {
log.debug("Cannot construct " + targetClass.getName() + ": " + t);
}
}
return null;
}
}