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

AMQ-7309: Compilation fixes after revert of JMS 2.0 api change

This commit is contained in:
Christopher L. Shannon (cshannon) 2022-03-03 16:51:08 -05:00
parent da9e5276f1
commit b31cc6f2cb
4 changed files with 12 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
activemq-unit-tests/src/test/java/org/apache/activemq/JMSMessageTest.java
View File

@ -373,16 +373,6 @@ public class JMSMessageTest extends JmsTestSupport {
expiration = arg0;
}
@Override
public long getJMSDeliveryTime() throws JMSException {
return 0;
}
@Override
public void setJMSDeliveryTime(long l) throws JMSException {
}
@Override
public int getJMSPriority() throws JMSException {
return priority;
@ -498,16 +488,6 @@ public class JMSMessageTest extends JmsTestSupport {
public void clearBody() throws JMSException {
}
@Override
public <T> T getBody(Class<T> aClass) throws JMSException {
return null;
}
@Override
public boolean isBodyAssignableTo(Class aClass) throws JMSException {
return true;
}
@Override
public void setText(String arg0) throws JMSException {
text = arg0;

7
activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5212Test.java
View File

@ -29,7 +29,6 @@ import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import javax.jms.CompletionListener;
import javax.jms.Message;
import javax.jms.MessageConsumer;
import javax.jms.Session;
@ -124,7 +123,7 @@ public class AMQ5212Test {
}
ActiveMQTextMessage message = new ActiveMQTextMessage();
message.setDestination(dest);
activeMQMessageProducer.send(message, (CompletionListener) null);
activeMQMessageProducer.send(message, null);
// send a duplicate
activeMQConnection.syncSendPacket(message);
@ -165,7 +164,7 @@ public class AMQ5212Test {
ActiveMQMessageProducer activeMQMessageProducer = (ActiveMQMessageProducer) activeMQSession.createProducer(dest);
ActiveMQTextMessage message = new ActiveMQTextMessage();
message.setDestination(dest);
activeMQMessageProducer.send(message, (CompletionListener) null);
activeMQMessageProducer.send(message, null);
// send a duplicate
activeMQConnection.syncSendPacket(message);
@ -210,7 +209,7 @@ public class AMQ5212Test {
ActiveMQMessageProducer activeMQMessageProducer = (ActiveMQMessageProducer) activeMQSession.createProducer(dest);
ActiveMQTextMessage message = new ActiveMQTextMessage();
message.setDestination(dest);
activeMQMessageProducer.send(message, (CompletionListener) null);
activeMQMessageProducer.send(message, null);
// send a duplicate
activeMQConnection.syncSendPacket(message);

9
activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6122Test.java
View File

@ -21,7 +21,10 @@ import static org.junit.Assert.assertNotNull;
import java.util.ArrayList;
import java.util.List;
import javax.jms.*;
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.MessageConsumer;
import javax.jms.Session;
import org.apache.activemq.ActiveMQConnection;
import org.apache.activemq.ActiveMQConnectionFactory;
@ -108,7 +111,7 @@ public class AMQ6122Test {
ActiveMQMessageProducer activeMQMessageProducer = (ActiveMQMessageProducer) activeMQSession.createProducer(dest);
ActiveMQTextMessage message = new ActiveMQTextMessage();
message.setDestination(dest);
activeMQMessageProducer.send(message, (CompletionListener) null);
activeMQMessageProducer.send(message, null);
// send a duplicate
activeMQConnection.syncSendPacket(message);
@ -146,7 +149,7 @@ public class AMQ6122Test {
@Override
public void run() {
try {
producer.send(message, (CompletionListener) null);
producer.send(message, null);
} catch (JMSException e) {
e.printStackTrace();
}

26
activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCIOExceptionHandlerTest.java
View File

@ -16,35 +16,20 @@
*/
package org.apache.activemq.store.jdbc;
import java.io.File;
import java.io.IOException;
import java.io.ObjectInputStream;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.io.PrintWriter;
import java.net.Socket;
import java.rmi.registry.Registry;
import java.sql.SQLException;
import java.sql.SQLFeatureNotSupportedException;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
import javax.jms.Connection;
import javax.management.*;
import javax.management.loading.ClassLoaderRepository;
import javax.management.remote.JMXConnectorServer;
import javax.management.remote.JMXConnectorServerFactory;
import javax.management.remote.JMXServiceURL;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.ft.SyncCreateDataSource;
import org.apache.activemq.broker.jmx.ManagementContext;
import org.apache.activemq.bugs.embedded.ThreadExplorer;
import org.apache.activemq.util.DefaultTestAppender;
import org.apache.activemq.util.IOHelper;
import org.apache.activemq.util.LeaseLockerIOExceptionHandler;
import org.apache.activemq.util.Wait;
import org.apache.derby.jdbc.EmbeddedDataSource;
@ -56,15 +41,10 @@ import org.apache.logging.log4j.core.config.Property;
import org.apache.logging.log4j.core.filter.AbstractFilter;
import org.apache.logging.log4j.core.layout.MessageLayout;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
/**
* Test to see if the JDBCExceptionIOHandler will restart the transport connectors correctly after
* the underlying DB has been stopped and restarted