Merge branch 'cleanup-3.2.x' into 3.2.x

* cleanup-3.2.x:
  Fix unnecessary @SupressWarnings annotations
  Fix Javadoc warnings
  Fix unused local variable warnings
  Fix unused type compiler warnings
  Fix 'is already an instance of type' warnings
This commit is contained in:
Phillip Webb
2013-01-31 12:52:51 -08:00
94 changed files with 280 additions and 193 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2012 the original author or authors.
* Copyright 2002-2013 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -207,7 +207,7 @@ public class JmsTemplate102Tests extends TestCase {
template.execute(new SessionCallback() {
@Override
public Object doInJms(Session session) throws JMSException {
boolean b = session.getTransacted();
session.getTransacted();
return null;
}
});
@@ -249,8 +249,8 @@ public class JmsTemplate102Tests extends TestCase {
template.execute(new ProducerCallback() {
@Override
public Object doInJms(Session session, MessageProducer producer) throws JMSException {
boolean b = session.getTransacted();
int i = producer.getPriority();
session.getTransacted();
producer.getPriority();
return null;
}
});

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2012 the original author or authors.
* Copyright 2002-2013 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -190,8 +190,8 @@ public class JmsTemplateTests extends TestCase {
template.execute(new ProducerCallback() {
@Override
public Object doInJms(Session session, MessageProducer producer) throws JMSException {
boolean b = session.getTransacted();
int i = producer.getPriority();
session.getTransacted();
producer.getPriority();
return null;
}
});
@@ -234,8 +234,8 @@ public class JmsTemplateTests extends TestCase {
template.execute(new ProducerCallback() {
@Override
public Object doInJms(Session session, MessageProducer producer) throws JMSException {
boolean b = session.getTransacted();
int i = producer.getPriority();
session.getTransacted();
producer.getPriority();
return null;
}
});
@@ -264,7 +264,7 @@ public class JmsTemplateTests extends TestCase {
template.execute(new SessionCallback() {
@Override
public Object doInJms(Session session) throws JMSException {
boolean b = session.getTransacted();
session.getTransacted();
return null;
}
});
@@ -303,14 +303,14 @@ public class JmsTemplateTests extends TestCase {
template.execute(new SessionCallback() {
@Override
public Object doInJms(Session session) throws JMSException {
boolean b = session.getTransacted();
session.getTransacted();
return null;
}
});
template.execute(new SessionCallback() {
@Override
public Object doInJms(Session session) throws JMSException {
boolean b = session.getTransacted();
session.getTransacted();
return null;
}
});
@@ -321,7 +321,7 @@ public class JmsTemplateTests extends TestCase {
TransactionAwareConnectionFactoryProxy tacf = new TransactionAwareConnectionFactoryProxy(scf);
Connection tac = tacf.createConnection();
Session tas = tac.createSession(false, Session.AUTO_ACKNOWLEDGE);
boolean b = tas.getTransacted();
tas.getTransacted();
tas.close();
tac.close();

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2012 the original author or authors.
* Copyright 2002-2013 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,8 +20,8 @@ import javax.jms.Destination;
import javax.jms.Session;
import junit.framework.TestCase;
import org.easymock.MockControl;
import org.easymock.MockControl;
import org.springframework.jca.StubResourceAdapter;
import org.springframework.jms.StubQueue;
import org.springframework.jms.support.destination.DestinationResolver;
@@ -89,6 +89,7 @@ public class DefaultJmsActivationSpecFactoryTests extends TestCase {
}
@SuppressWarnings("unused")
private static class StubActiveMQActivationSpec extends StubJmsActivationSpec {
private int maxSessions;
@@ -133,6 +134,7 @@ public class DefaultJmsActivationSpecFactoryTests extends TestCase {
}
@SuppressWarnings("unused")
private static class StubWebSphereActivationSpecImpl extends StubJmsActivationSpec {
private Destination destination;