You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by no...@apache.org on 2010/01/18 13:12:19 UTC
svn commit: r900361 - in /james/imap/trunk:
decode/src/main/java/org/apache/james/imap/decode/parser/
decode/src/test/java/org/apache/james/imap/decode/
decode/src/test/java/org/apache/james/imap/decode/parser/
deployment/src/test/java/org/apache/james...
Author: norman
Date: Mon Jan 18 12:12:17 2010
New Revision: 900361
URL: http://svn.apache.org/viewvc?rev=900361&view=rev
Log:
just fix some warnings related to generics and deprecated methods
Modified:
james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/FetchCommandParser.java
james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/ImapParserFactory.java
james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/DecoderUtilsLocaleDateTest.java
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/DecoderUtilsTest.java
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/FetchPartPathDecoderTest.java
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java
james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/ImapHostSystem.java
james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/torque/ExpungeTest.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultImpl.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ImapResponseComposer.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/base/ImapResponseComposerImpl.java
james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/AbstractTestImapResponseComposer.java
james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/LSubResponseEncoderTest.java
james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/MockImapResponseWriter.java
james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/SearchResponseEncoderTest.java
james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/base/ImapResponseComposerImplTest.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SearchProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/MailboxEventAnalyser.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchResponseBuilder.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/MessageResultUtils.java
james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/base/FakeMailboxListenerFlagsUpdate.java
james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/fetch/MessageResultUtilsTest.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultIterator.java
james/imap/trunk/store/src/test/java/org/apache/james/imap/store/PartContentBuilderComplexMultipartTest.java
james/imap/trunk/store/src/test/java/org/apache/james/imap/store/PartContentBuilderMultipartAlternativeTest.java
Modified: james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/FetchCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/FetchCommandParser.java?rev=900361&r1=900360&r2=900361&view=diff
==============================================================================
--- james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/FetchCommandParser.java (original)
+++ james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/FetchCommandParser.java Mon Jan 18 12:12:17 2010
@@ -157,7 +157,7 @@
decoder.decode(parameter);
final int sectionType = getSectionType(decoder);
- final List names = decoder.getNames();
+ final List<String> names = decoder.getNames();
final int[] path = decoder.getPath();
final BodyFetchElement bodyFetchElement = new BodyFetchElement(
responseName, sectionType, path, names, firstOctet,
Modified: james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/ImapParserFactory.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/ImapParserFactory.java?rev=900361&r1=900360&r2=900361&view=diff
==============================================================================
--- james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/ImapParserFactory.java (original)
+++ james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/ImapParserFactory.java Mon Jan 18 12:12:17 2010
@@ -38,7 +38,7 @@
*/
public class ImapParserFactory implements
ImapCommandParserFactory {
- private Map<String, Class> _imapCommands;
+ private Map<String, Class<?>> _imapCommands;
private final ImapMessageFactory messageFactory;
@@ -50,7 +50,7 @@
final StatusResponseFactory statusResponseFactory) {
this.messageFactory = messageFactory;
this.statusResponseFactory = statusResponseFactory;
- _imapCommands = new HashMap<String, Class>();
+ _imapCommands = new HashMap<String, Class<?>>();
// Commands valid in any state
// CAPABILITY, NOOP, and LOGOUT
@@ -128,7 +128,7 @@
* @see org.apache.james.imap.decode.parser.ImapCommandParserFactory#getParser(java.lang.String)
*/
public ImapCommandParser getParser(String commandName) {
- Class cmdClass = (Class) _imapCommands.get(commandName.toUpperCase());
+ Class<?> cmdClass = (Class<?>) _imapCommands.get(commandName.toUpperCase());
if (cmdClass == null) {
return null;
@@ -137,7 +137,7 @@
}
}
- private ImapCommandParser createCommand(Class commandClass) {
+ private ImapCommandParser createCommand(Class<?> commandClass) {
try {
ImapCommandParser cmd = (ImapCommandParser) commandClass
.newInstance();
@@ -151,7 +151,7 @@
}
}
- protected void initialiseParser(Class commandClass, ImapCommandParser cmd) {
+ protected void initialiseParser(Class<?> commandClass, ImapCommandParser cmd) {
if (cmd instanceof DelegatingImapCommandParser) {
((DelegatingImapCommandParser) cmd).setParserFactory(this);
Modified: james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java?rev=900361&r1=900360&r2=900361&view=diff
==============================================================================
--- james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java (original)
+++ james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java Mon Jan 18 12:12:17 2010
@@ -930,9 +930,9 @@
private synchronized void loadCharsetNames() {
if (charsetNames == null) {
charsetNames = new HashSet<String>();
- for (final Iterator it = Charset.availableCharsets().values()
+ for (final Iterator<Charset> it = Charset.availableCharsets().values()
.iterator(); it.hasNext();) {
- final Charset charset = (Charset) it.next();
+ final Charset charset = it.next();
final Set<String> aliases = charset.aliases();
charsetNames.addAll(aliases);
}
Modified: james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/DecoderUtilsLocaleDateTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/DecoderUtilsLocaleDateTest.java?rev=900361&r1=900360&r2=900361&view=diff
==============================================================================
--- james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/DecoderUtilsLocaleDateTest.java (original)
+++ james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/DecoderUtilsLocaleDateTest.java Mon Jan 18 12:12:17 2010
@@ -81,7 +81,8 @@
decodeDateTime();
}
- private void decodeDateTime() throws Exception {
+ @SuppressWarnings("deprecation")
+ private void decodeDateTime() throws Exception {
assertEquals("21 Oct 1972 20:00:00 GMT", DecoderUtils.decodeDateTime(
"21-Oct-1972 20:00:00 +0000").toGMTString());
assertEquals("21 Oct 1972 19:00:00 GMT", DecoderUtils.decodeDateTime(
Modified: james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/DecoderUtilsTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/DecoderUtilsTest.java?rev=900361&r1=900360&r2=900361&view=diff
==============================================================================
--- james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/DecoderUtilsTest.java (original)
+++ james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/DecoderUtilsTest.java Mon Jan 18 12:12:17 2010
@@ -109,7 +109,8 @@
}
}
- public void testSimpleDecodeDateTime() throws Exception {
+ @SuppressWarnings("deprecation")
+ public void testSimpleDecodeDateTime() throws Exception {
assertEquals("21 Oct 1972 20:00:00 GMT", DecoderUtils.decodeDateTime(
"21-Oct-1972 20:00:00 +0000").toGMTString());
assertEquals("21 Oct 1972 19:00:00 GMT", DecoderUtils.decodeDateTime(
@@ -173,7 +174,8 @@
"21-Oct-1972 06:00:00 -1000").toGMTString());
}
- public void testAppleMailPrependsZeroNotSpace() throws Exception {
+ @SuppressWarnings("deprecation")
+ public void testAppleMailPrependsZeroNotSpace() throws Exception {
assertEquals("9 Apr 2008 13:17:51 GMT", DecoderUtils.decodeDateTime(
"09-Apr-2008 15:17:51 +0200").toGMTString());
}
Modified: james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/FetchPartPathDecoderTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/FetchPartPathDecoderTest.java?rev=900361&r1=900360&r2=900361&view=diff
==============================================================================
--- james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/FetchPartPathDecoderTest.java (original)
+++ james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/FetchPartPathDecoderTest.java Mon Jan 18 12:12:17 2010
@@ -172,9 +172,9 @@
}
base = base + ')';
decoder.decode(base);
- Collection results = decoder.getNames();
+ Collection<String> results = decoder.getNames();
assertNotNull(results);
- Iterator it = results.iterator();
+ Iterator<String> it = results.iterator();
for (int i = 0; i < names.length; i++) {
assertEquals(names[i], it.next());
}
Modified: james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java?rev=900361&r1=900360&r2=900361&view=diff
==============================================================================
--- james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java (original)
+++ james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java Mon Jan 18 12:12:17 2010
@@ -88,9 +88,9 @@
public void testBadCharset() throws Exception {
final Collection<String> charsetNames = new HashSet<String>();
- for (final Iterator it = Charset.availableCharsets().values()
+ for (final Iterator<Charset> it = Charset.availableCharsets().values()
.iterator(); it.hasNext();) {
- final Charset charset = (Charset) it.next();
+ final Charset charset = it.next();
final Set<String> aliases = charset.aliases();
charsetNames.addAll(aliases);
}
Modified: james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java?rev=900361&r1=900360&r2=900361&view=diff
==============================================================================
--- james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java (original)
+++ james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java Mon Jan 18 12:12:17 2010
@@ -173,9 +173,9 @@
public void testBadCharset() throws Exception {
final Collection<String> charsetNames = new HashSet<String>();
- for (final Iterator it = Charset.availableCharsets().values()
+ for (final Iterator<Charset> it = Charset.availableCharsets().values()
.iterator(); it.hasNext();) {
- final Charset charset = (Charset) it.next();
+ final Charset charset = it.next();
final Set<String> aliases = charset.aliases();
charsetNames.addAll(aliases);
}
Modified: james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/ImapHostSystem.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/ImapHostSystem.java?rev=900361&r1=900360&r2=900361&view=diff
==============================================================================
--- james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/ImapHostSystem.java (original)
+++ james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/ImapHostSystem.java Mon Jan 18 12:12:17 2010
@@ -32,6 +32,7 @@
import org.apache.james.imap.api.process.ImapProcessor;
import org.apache.james.imap.decode.ImapDecoder;
import org.apache.james.imap.encode.ImapEncoder;
+import org.apache.james.imap.mailbox.MailboxSession.User;
import org.apache.james.imap.main.ImapRequestHandler;
import org.apache.james.imap.main.ImapSessionImpl;
import org.apache.james.test.functional.HostSystem;
@@ -44,11 +45,11 @@
private ImapProcessor processor;
- private final Set users;
+ private final Set<User> users;
public ImapHostSystem() {
super();
- users = new HashSet();
+ users = new HashSet<User>();
}
public void configure(final ImapDecoder decoder, final ImapEncoder encoder,
Modified: james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/torque/ExpungeTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/torque/ExpungeTest.java?rev=900361&r1=900360&r2=900361&view=diff
==============================================================================
--- james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/torque/ExpungeTest.java (original)
+++ james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/torque/ExpungeTest.java Mon Jan 18 12:12:17 2010
@@ -21,7 +21,6 @@
import org.apache.james.imap.functional.suite.Expunge;
import org.apache.james.mailboxmanager.torque.TorqueHostSystemFactory;
-import org.apache.james.test.functional.HostSystem;
public class ExpungeTest extends Expunge {
Modified: james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultImpl.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultImpl.java?rev=900361&r1=900360&r2=900361&view=diff
==============================================================================
--- james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultImpl.java (original)
+++ james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/util/MessageResultImpl.java Mon Jan 18 12:12:17 2010
@@ -333,7 +333,8 @@
private int content;
- public final int getContent() {
+ @SuppressWarnings("unused")
+ public final int getContent() {
return content;
}
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ImapResponseComposer.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ImapResponseComposer.java?rev=900361&r1=900360&r2=900361&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ImapResponseComposer.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ImapResponseComposer.java Mon Jan 18 12:12:17 2010
@@ -160,7 +160,7 @@
* @param name
* mailbox name
*/
- public abstract void listResponse(String typeName, List attributes,
+ public abstract void listResponse(String typeName, List<String> attributes,
String hierarchyDelimiter, String name) throws IOException;
/**
@@ -200,7 +200,7 @@
public abstract void tag(String tag) throws IOException;
public abstract void statusResponse(String tag, ImapCommand command,
- String type, String responseCode, Collection parameters,
+ String type, String responseCode, Collection<String> parameters,
long number, String text) throws IOException;
public abstract void statusResponse(Long messages, Long recent,
Modified: james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/base/ImapResponseComposerImpl.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/base/ImapResponseComposerImpl.java?rev=900361&r1=900360&r2=900361&view=diff
==============================================================================
--- james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/base/ImapResponseComposerImpl.java (original)
+++ james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/base/ImapResponseComposerImpl.java Mon Jan 18 12:12:17 2010
@@ -258,7 +258,7 @@
* java.lang.String, Collection, long, java.lang.String)
*/
public void statusResponse(String tag, ImapCommand command, String type,
- String responseCode, Collection parameters, long number, String text)
+ String responseCode, Collection<String> parameters, long number, String text)
throws IOException {
if (tag == null) {
untagged();
@@ -271,8 +271,8 @@
message(responseCode);
if (parameters != null && !parameters.isEmpty()) {
openParen();
- for (Iterator it = parameters.iterator(); it.hasNext();) {
- final String parameter = (String) it.next();
+ for (Iterator<String> it = parameters.iterator(); it.hasNext();) {
+ final String parameter = it.next();
message(parameter);
}
closeParen();
@@ -338,14 +338,14 @@
end();
}
- public void listResponse(String typeName, List attributes,
+ public void listResponse(String typeName, List<String> attributes,
String hierarchyDelimiter, String name) throws IOException {
untagged();
message(typeName);
openParen();
if (attributes != null) {
- for (Iterator it = attributes.iterator(); it.hasNext();) {
- final String attribute = (String) it.next();
+ for (Iterator<String> it = attributes.iterator(); it.hasNext();) {
+ final String attribute = it.next();
message(attribute);
}
}
Modified: james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/AbstractTestImapResponseComposer.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/AbstractTestImapResponseComposer.java?rev=900361&r1=900360&r2=900361&view=diff
==============================================================================
--- james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/AbstractTestImapResponseComposer.java (original)
+++ james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/AbstractTestImapResponseComposer.java Mon Jan 18 12:12:17 2010
@@ -21,7 +21,6 @@
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.List;
import javax.mail.Flags;
@@ -153,11 +152,11 @@
public void testShouldEncodeUnparameterisedStatus() throws Exception {
checkStatusResponseEncode("A1 NO [ALERT] APPEND failed\r\n", "A1",
- command("APPEND"), "NO", "ALERT", Collections.EMPTY_LIST, 0,
+ command("APPEND"), "NO", "ALERT", new ArrayList<String>(), 0,
"failed");
checkStatusResponseEncode("A1 BAD [TRYCREATE] SELECT whatever\r\n",
"A1", command("SELECT"), "BAD", "TRYCREATE",
- Collections.EMPTY_LIST, 0, "whatever");
+ new ArrayList<String>(), 0, "whatever");
}
public void testShouldEncodeListParameterStatus() throws Exception {
@@ -202,7 +201,7 @@
protected abstract byte[] encodeSearchResponse(long[] ids) throws Exception;
private void checkListResponseEncode(String expected, String typeName,
- List attributes, String hierarchyDelimiter, String name)
+ List<String> attributes, String hierarchyDelimiter, String name)
throws Exception {
StringBuffer buffer = new StringBuffer();
byte[] output = encodeListResponse(typeName, attributes,
@@ -215,7 +214,7 @@
}
protected abstract byte[] encodeListResponse(String typeName,
- List attributes, String hierarchyDelimiter, String name)
+ List<String> attributes, String hierarchyDelimiter, String name)
throws Exception;
private void checkStatusResponseEncode(String expected, Long messages,
@@ -239,11 +238,11 @@
protected abstract byte[] encodeStatusResponse(String tag,
ImapCommand command, String type, String responseCode,
- Collection parameters, int number, String text) throws Exception;
+ Collection<String> parameters, int number, String text) throws Exception;
private void checkStatusResponseEncode(String expected, String tag,
ImapCommand command, String type, String responseCode,
- Collection parameters, int number, String text) throws Exception {
+ Collection<String> parameters, int number, String text) throws Exception {
StringBuffer buffer = new StringBuffer();
byte[] output = encodeStatusResponse(tag, command, type, responseCode,
parameters, number, text);
Modified: james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/LSubResponseEncoderTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/LSubResponseEncoderTest.java?rev=900361&r1=900360&r2=900361&view=diff
==============================================================================
--- james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/LSubResponseEncoderTest.java (original)
+++ james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/LSubResponseEncoderTest.java Mon Jan 18 12:12:17 2010
@@ -59,21 +59,24 @@
assertFalse(encoder.isAcceptable(null));
}
- public void testName() throws Exception {
+ @SuppressWarnings("unchecked")
+ public void testName() throws Exception {
checking(new Expectations() {{
oneOf(composer).listResponse(with(same("LSUB")),with(aNull(List.class)), with(same(".")), with(same("INBOX.name")));
}});
encoder.encode(new LSubResponse("INBOX.name", ".", false), composer, new FakeImapSession());
}
- public void testDelimiter() throws Exception {
+ @SuppressWarnings("unchecked")
+ public void testDelimiter() throws Exception {
checking(new Expectations() {{
oneOf(composer).listResponse(with(same("LSUB")),with(aNull(List.class)), with(same("@")), with(same("INBOX.name")));
}});
encoder.encode(new LSubResponse("INBOX.name", "@", false), composer, new FakeImapSession());
}
- public void testNoDelimiter() throws Exception {
+ @SuppressWarnings("unchecked")
+ public void testNoDelimiter() throws Exception {
checking(new Expectations() {{
oneOf(composer).listResponse(with(same("LSUB")),with(aNull(List.class)), with(aNull(String.class)), with(same("INBOX.name")));
}});
Modified: james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/MockImapResponseWriter.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/MockImapResponseWriter.java?rev=900361&r1=900360&r2=900361&view=diff
==============================================================================
--- james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/MockImapResponseWriter.java (original)
+++ james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/MockImapResponseWriter.java Mon Jan 18 12:12:17 2010
@@ -28,7 +28,7 @@
public class MockImapResponseWriter implements ImapResponseWriter {
- public final List operations = new ArrayList();
+ public final List<Object> operations = new ArrayList<Object>();
public void commandName(String commandName) {
operations.add(new CommandNameOperation(commandName));
Modified: james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/SearchResponseEncoderTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/SearchResponseEncoderTest.java?rev=900361&r1=900360&r2=900361&view=diff
==============================================================================
--- james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/SearchResponseEncoderTest.java (original)
+++ james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/SearchResponseEncoderTest.java Mon Jan 18 12:12:17 2010
@@ -59,7 +59,8 @@
assertFalse(encoder.isAcceptable(null));
}
- public void testName() throws Exception {
+ @SuppressWarnings("unchecked")
+ public void testName() throws Exception {
checking(new Expectations() {{
oneOf(composer).listResponse(
with(same("LIST")),
@@ -70,7 +71,8 @@
encoder.encode(new ListResponse(false, false, false, false, false, false, ".", "INBOX.name"), composer, new FakeImapSession());
}
- public void testDelimiter() throws Exception {
+ @SuppressWarnings("unchecked")
+ public void testDelimiter() throws Exception {
checking(new Expectations() {{
oneOf(composer).listResponse(
with(same("LIST")),
@@ -81,7 +83,8 @@
encoder.encode(new ListResponse(false, false, false, false, false, false, "@", "INBOX.name"), composer, new FakeImapSession());
}
- public void testNoDelimiter() throws Exception {
+ @SuppressWarnings("unchecked")
+ public void testNoDelimiter() throws Exception {
checking(new Expectations() {{
oneOf(composer).listResponse(
with(same("LIST")),
Modified: james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/base/ImapResponseComposerImplTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/base/ImapResponseComposerImplTest.java?rev=900361&r1=900360&r2=900361&view=diff
==============================================================================
--- james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/base/ImapResponseComposerImplTest.java (original)
+++ james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/base/ImapResponseComposerImplTest.java Mon Jan 18 12:12:17 2010
@@ -44,7 +44,7 @@
super.tearDown();
}
- protected byte[] encodeListResponse(String typeName, List attributes,
+ protected byte[] encodeListResponse(String typeName, List<String> attributes,
String hierarchyDelimiter, String name) throws Exception {
composer.listResponse(typeName, attributes, hierarchyDelimiter, name);
return writer.getBytes();
@@ -73,7 +73,7 @@
}
protected byte[] encodeStatusResponse(String tag, ImapCommand command,
- String type, String responseCode, Collection parameters,
+ String type, String responseCode, Collection<String> parameters,
int number, String text) throws Exception {
composer.statusResponse(tag, command, type, responseCode, parameters,
number, text);
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SearchProcessor.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SearchProcessor.java?rev=900361&r1=900360&r2=900361&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SearchProcessor.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SearchProcessor.java Mon Jan 18 12:12:17 2010
@@ -68,7 +68,7 @@
final SearchQuery query = toQuery(searchKey, session);
- final Collection results = findIds(useUids, session, mailbox, query);
+ final Collection<Long> results = findIds(useUids, session, mailbox, query);
final long[] ids = toArray(results);
final SearchResponse response = new SearchResponse(ids);
@@ -81,8 +81,8 @@
}
}
- private long[] toArray(final Collection results) {
- final Iterator it = results.iterator();
+ private long[] toArray(final Collection<Long> results) {
+ final Iterator<Long> it = results.iterator();
final int length = results.size();
long[] ids = new long[length];
for (int i = 0; i < length; i++) {
@@ -91,7 +91,7 @@
return ids;
}
- private Collection findIds(final boolean useUids,
+ private Collection<Long> findIds(final boolean useUids,
final ImapSession session, Mailbox mailbox, final SearchQuery query)
throws MailboxException {
final Iterator<Long> it = mailbox.search(query, ImapSessionUtils
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/MailboxEventAnalyser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/MailboxEventAnalyser.java?rev=900361&r1=900360&r2=900361&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/MailboxEventAnalyser.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/MailboxEventAnalyser.java Mon Jan 18 12:12:17 2010
@@ -89,9 +89,9 @@
private boolean interestingFlags(FlagsUpdated updated) {
final boolean result;
- final Iterator it = updated.flagsIterator();
+ final Iterator<Flags.Flag> it = updated.flagsIterator();
if (it.hasNext()) {
- final Flags.Flag flag = (Flags.Flag) it.next();
+ final Flags.Flag flag = it.next();
if (flag.equals(uninterestingFlag)) {
result = false;
} else {
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchResponseBuilder.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchResponseBuilder.java?rev=900361&r1=900360&r2=900361&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchResponseBuilder.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchResponseBuilder.java Mon Jan 18 12:12:17 2010
@@ -205,7 +205,7 @@
final String name = fetchElement.getResponseName();
final int specifier = fetchElement.getSectionType();
final int[] path = fetchElement.getPath();
- final Collection names = fetchElement.getFieldNames();
+ final Collection<String> names = fetchElement.getFieldNames();
final boolean isBase = (path == null || path.length == 0);
final FetchResponse.BodyElement fullResult = bodyContent(messageResult,
name, specifier, path, names, isBase);
@@ -217,7 +217,7 @@
private FetchResponse.BodyElement bodyContent(
final MessageResult messageResult, final String name,
- final int specifier, final int[] path, final Collection names,
+ final int specifier, final int[] path, final Collection<String> names,
final boolean isBase) throws MessagingException {
final FetchResponse.BodyElement fullResult;
switch (specifier) {
@@ -309,7 +309,7 @@
private FetchResponse.BodyElement fieldsNot(
final MessageResult messageResult, String name, final int[] path,
- Collection names, final boolean isBase)
+ Collection<String> names, final boolean isBase)
throws MailboxException, MessagingException {
final FetchResponse.BodyElement result;
@@ -321,7 +321,7 @@
}
private FetchResponse.BodyElement fields(final MessageResult messageResult,
- String name, final int[] path, Collection names,
+ String name, final int[] path, Collection<String> names,
final boolean isBase) throws MailboxException,
MessagingException {
final FetchResponse.BodyElement result;
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/MessageResultUtils.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/MessageResultUtils.java?rev=900361&r1=900360&r2=900361&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/MessageResultUtils.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/MessageResultUtils.java Mon Jan 18 12:12:17 2010
@@ -97,13 +97,13 @@
* their natural order
* @throws MessagingException
*/
- public static List<MessageResult.Header> getMatching(final Collection names,
+ public static List<MessageResult.Header> getMatching(final Collection<String> names,
final Iterator<MessageResult.Header> iterator) throws MessagingException {
final List<MessageResult.Header> result = matching(names, iterator, false);
return result;
}
- private static List<MessageResult.Header> matching(final Collection names,
+ private static List<MessageResult.Header> matching(final Collection<String> names,
final Iterator<MessageResult.Header> iterator, boolean not)
throws MailboxException {
final List<MessageResult.Header> results = new ArrayList<MessageResult.Header>(names.size());
@@ -120,13 +120,13 @@
return results;
}
- private static boolean contains(final Collection names,
+ private static boolean contains(final Collection<String> names,
MessageResult.Header header) throws MailboxException {
boolean match = false;
final String headerName = header.getName();
if (headerName != null) {
- for (final Iterator it = names.iterator(); it.hasNext();) {
- final String name = (String) it.next();
+ for (final Iterator<String> it = names.iterator(); it.hasNext();) {
+ final String name = it.next();
if (name.equalsIgnoreCase(headerName)) {
match = true;
break;
@@ -148,7 +148,7 @@
* their natural order
* @throws MessagingException
*/
- public static List<MessageResult.Header> getNotMatching(final Collection names,
+ public static List<MessageResult.Header> getNotMatching(final Collection<String> names,
final Iterator<MessageResult.Header> iterator) throws MessagingException {
final List<MessageResult.Header> result = matching(names, iterator, true);
return result;
@@ -193,13 +193,12 @@
* @return <code>List</code> of <code>@MessageResult.Header</code>'s, in their natural order
* @throws MessagingException
*/
- public static List getNotMatching(final String[] names,
- final Iterator iterator) throws MessagingException {
+ public static List<MessageResult.Header> getNotMatching(final String[] names,
+ final Iterator<MessageResult.Header> iterator) throws MessagingException {
final List<MessageResult.Header> results = new ArrayList<MessageResult.Header>(20);
if (iterator != null) {
while (iterator.hasNext()) {
- MessageResult.Header header = (MessageResult.Header) iterator
- .next();
+ MessageResult.Header header = iterator.next();
final String headerName = header.getName();
if (headerName != null) {
final int length = names.length;
Modified: james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/base/FakeMailboxListenerFlagsUpdate.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/base/FakeMailboxListenerFlagsUpdate.java?rev=900361&r1=900360&r2=900361&view=diff
==============================================================================
--- james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/base/FakeMailboxListenerFlagsUpdate.java (original)
+++ james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/base/FakeMailboxListenerFlagsUpdate.java Mon Jan 18 12:12:17 2010
@@ -24,6 +24,7 @@
import java.util.List;
import javax.mail.Flags;
+import javax.mail.Flags.Flag;
import org.apache.james.imap.mailbox.MailboxListener.FlagsUpdated;
@@ -53,7 +54,7 @@
return sessionId;
}
- public Iterator flagsIterator() {
+ public Iterator<Flag> flagsIterator() {
return flags.iterator();
}
Modified: james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/fetch/MessageResultUtilsTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/fetch/MessageResultUtilsTest.java?rev=900361&r1=900360&r2=900361&view=diff
==============================================================================
--- james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/fetch/MessageResultUtilsTest.java (original)
+++ james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/fetch/MessageResultUtilsTest.java Mon Jan 18 12:12:17 2010
@@ -56,9 +56,6 @@
return 0;
}
- public void writeTo(StringBuffer buffer) {
- }
-
public String getName() {
return name;
}
Modified: james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultIterator.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultIterator.java?rev=900361&r1=900360&r2=900361&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultIterator.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultIterator.java Mon Jan 18 12:12:17 2010
@@ -27,7 +27,6 @@
import java.util.NoSuchElementException;
import javax.mail.Flags;
-import javax.mail.internet.MimeMessage;
import org.apache.james.imap.mailbox.Content;
import org.apache.james.imap.mailbox.MailboxException;
@@ -123,30 +122,18 @@
throw exception;
}
- public FetchGroup getIncludedResults() {
+ @SuppressWarnings("unused")
+ public FetchGroup getIncludedResults() {
return FETCH_GROUP;
}
public Date getInternalDate() {
return internalDate;
}
-
- public String getKey() {
- return null;
- }
-
public Content getBody() throws MailboxException {
throw exception;
}
- public MimeMessage getMimeMessage() throws MailboxException {
- throw exception;
- }
-
- public int getMsn() {
- return 0;
- }
-
public int getSize() {
return size;
}
@@ -169,11 +156,6 @@
return (int) diff == 0 ? 0 : diff > 0 ? 1 : -1;
}
- public Content getMessageBody(MimePath path)
- throws MailboxException {
- throw exception;
- }
-
public Content getFullContent(MimePath path)
throws MailboxException {
throw exception;
Modified: james/imap/trunk/store/src/test/java/org/apache/james/imap/store/PartContentBuilderComplexMultipartTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/test/java/org/apache/james/imap/store/PartContentBuilderComplexMultipartTest.java?rev=900361&r1=900360&r2=900361&view=diff
==============================================================================
--- james/imap/trunk/store/src/test/java/org/apache/james/imap/store/PartContentBuilderComplexMultipartTest.java (original)
+++ james/imap/trunk/store/src/test/java/org/apache/james/imap/store/PartContentBuilderComplexMultipartTest.java Mon Jan 18 12:12:17 2010
@@ -26,6 +26,7 @@
import junit.framework.TestCase;
+import org.apache.james.imap.mailbox.MessageResult.Header;
import org.apache.james.imap.store.PartContentBuilder.PartNotFoundException;
public class PartContentBuilderComplexMultipartTest extends TestCase {
@@ -195,14 +196,14 @@
private void checkContentType(String contentType, int[] position)
throws Exception {
- List headers = headers(position);
+ List<Header> headers = headers(position);
assertEquals(1, headers.size());
ResultHeader header = (ResultHeader) headers.get(0);
assertEquals(CONTENT_TYPE, header.getName());
assertEquals(contentType, header.getValue());
}
- private List headers(int[] position) throws Exception {
+ private List<Header> headers(int[] position) throws Exception {
to(position);
return builder.getMimeHeaders();
}
Modified: james/imap/trunk/store/src/test/java/org/apache/james/imap/store/PartContentBuilderMultipartAlternativeTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/test/java/org/apache/james/imap/store/PartContentBuilderMultipartAlternativeTest.java?rev=900361&r1=900360&r2=900361&view=diff
==============================================================================
--- james/imap/trunk/store/src/test/java/org/apache/james/imap/store/PartContentBuilderMultipartAlternativeTest.java (original)
+++ james/imap/trunk/store/src/test/java/org/apache/james/imap/store/PartContentBuilderMultipartAlternativeTest.java Mon Jan 18 12:12:17 2010
@@ -24,6 +24,8 @@
import java.nio.charset.Charset;
import java.util.List;
+import org.apache.james.imap.mailbox.MessageResult.Header;
+
import junit.framework.TestCase;
public class PartContentBuilderMultipartAlternativeTest extends TestCase {
@@ -116,14 +118,14 @@
private void checkContentType(String contentType, String mail, int position)
throws Exception {
- List headers = headers(mail, position);
+ List<Header> headers = headers(mail, position);
assertEquals(1, headers.size());
ResultHeader header = (ResultHeader) headers.get(0);
assertEquals(CONTENT_TYPE, header.getName());
assertEquals(contentType, header.getValue());
}
- private List headers(String mail, int position) throws Exception {
+ private List<Header> headers(String mail, int position) throws Exception {
InputStream in = new ByteArrayInputStream(Charset.forName("us-ascii")
.encode(mail).array());
builder.parse(in);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org