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/08 22:55:39 UTC
svn commit: r897331 - in /james/imap/trunk:
processor/src/main/java/org/apache/james/imap/processor/fetch/
processor/src/test/java/org/apache/james/imap/processor/fetch/
store/src/main/java/org/apache/james/imap/store/
store/src/main/java/org/apache/ja...
Author: norman
Date: Fri Jan 8 21:55:38 2010
New Revision: 897331
URL: http://svn.apache.org/viewvc?rev=897331&view=rev
Log:
Add some generic and remove warnings
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.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/HeaderBodyElement.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/fetch/MessageResultUtilsTest.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/FullContent.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/PartContentBuilder.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultIterator.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/mail/MailboxMapper.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/mail/MessageMapper.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/user/SubscriptionMapper.java
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java?rev=897331&r1=897330&r2=897331&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java Fri Jan 8 21:55:38 2010
@@ -116,10 +116,10 @@
result.or(FetchGroup.MIME_DESCRIPTOR);
}
- Collection bodyElements = fetch.getBodyElements();
+ Collection<BodyFetchElement> bodyElements = fetch.getBodyElements();
if (bodyElements != null) {
- for (final Iterator it = bodyElements.iterator(); it.hasNext();) {
- final BodyFetchElement element = (BodyFetchElement) it.next();
+ for (final Iterator<BodyFetchElement> it = bodyElements.iterator(); it.hasNext();) {
+ final BodyFetchElement element = it.next();
final int sectionType = element.getSectionType();
final int[] path = element.getPath();
final boolean isBase = (path == null || path.length == 0);
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=897331&r1=897330&r2=897331&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 Fri Jan 8 21:55:38 2010
@@ -166,10 +166,10 @@
}
// BODY part responses.
- Collection elements = fetch.getBodyElements();
+ Collection<BodyFetchElement> elements = fetch.getBodyElements();
this.elements = new ArrayList<FetchResponse.BodyElement>();
- for (Iterator iterator = elements.iterator(); iterator.hasNext();) {
- BodyFetchElement fetchElement = (BodyFetchElement) iterator.next();
+ for (Iterator<BodyFetchElement> iterator = elements.iterator(); iterator.hasNext();) {
+ BodyFetchElement fetchElement = iterator.next();
final FetchResponse.BodyElement element = bodyFetch(result,
fetchElement);
if (element != null) {
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/HeaderBodyElement.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/HeaderBodyElement.java?rev=897331&r1=897330&r2=897331&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/HeaderBodyElement.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/HeaderBodyElement.java Fri Jan 8 21:55:38 2010
@@ -35,29 +35,34 @@
final class HeaderBodyElement implements BodyElement {
private final String name;
- private final List headers;
+ private final List<MessageResult.Header> headers;
private final long size;
- public HeaderBodyElement(final String name, final List headers) {
+ public HeaderBodyElement(final String name, final List<MessageResult.Header> headers) {
super();
this.name = name;
this.headers = headers;
size = calculateSize(headers);
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.message.response.FetchResponse.BodyElement#getName()
+ */
public String getName() {
return name;
}
- private long calculateSize(List headers) {
+
+ private long calculateSize(List<MessageResult.Header> headers) {
final int result;
if (headers.isEmpty()) {
result = 0;
} else {
int count = 0;
- for (final Iterator it = headers.iterator(); it.hasNext();) {
- MessageResult.Header header = (MessageResult.Header) it.next();
+ for (final Iterator<MessageResult.Header> it = headers.iterator(); it.hasNext();) {
+ MessageResult.Header header = it.next();
count += header.size() + 2;
}
result = count + 2;
@@ -65,15 +70,23 @@
return result;
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.message.response.FetchResponse.BodyElement#size()
+ */
public long size() {
return size;
}
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.message.response.FetchResponse.BodyElement#writeTo(java.nio.channels.WritableByteChannel)
+ */
public void writeTo(WritableByteChannel channel) throws IOException {
ByteBuffer endLine = ByteBuffer.wrap(ImapConstants.BYTES_LINE_END);
endLine.rewind();
- for (final Iterator it = headers.iterator(); it.hasNext();) {
- MessageResult.Header header = (MessageResult.Header) it.next();
+ for (final Iterator<MessageResult.Header> it = headers.iterator(); it.hasNext();) {
+ MessageResult.Header header = it.next();
header.writeTo(channel);
while (channel.write(endLine) > 0) {
}
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=897331&r1=897330&r2=897331&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 Fri Jan 8 21:55:38 2010
@@ -63,13 +63,12 @@
* their natural order
* @throws MessagingException
*/
- public static List getMatching(final String[] names, final Iterator iterator)
+ public static List<MessageResult.Header> getMatching(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/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=897331&r1=897330&r2=897331&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 Fri Jan 8 21:55:38 2010
@@ -39,7 +39,7 @@
Header headerThree;
- List headers;
+ List<MessageResult.Header> headers;
private static class Header implements MessageResult.Header {
@@ -78,7 +78,7 @@
headerOne = new Header("One");
headerTwo = new Header("Two");
headerThree = new Header("Three");
- headers = new ArrayList();
+ headers = new ArrayList<MessageResult.Header>();
headers.add(headerOne);
headers.add(headerTwo);
headers.add(headerThree);
@@ -89,7 +89,7 @@
}
public void testGetAllContent() throws Exception {
- List results = MessageResultUtils.getAll(headers.iterator());
+ List<MessageResult.Header> results = MessageResultUtils.getAll(headers.iterator());
assertEquals(3, results.size());
assertEquals(headerOne, results.get(0));
assertEquals(headerTwo, results.get(1));
@@ -98,7 +98,7 @@
public void testGetMatching() throws Exception {
- List results = MessageResultUtils
+ List<MessageResult.Header> results = MessageResultUtils
.getMatching(NAMES, headers.iterator());
assertEquals(2, results.size());
assertEquals(headerOne, results.get(0));
Modified: james/imap/trunk/store/src/main/java/org/apache/james/imap/store/FullContent.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/FullContent.java?rev=897331&r1=897330&r2=897331&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/FullContent.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/imap/store/FullContent.java Fri Jan 8 21:55:38 2010
@@ -34,11 +34,11 @@
public final class FullContent implements Content {
private final ByteBuffer contents;
- private final List headers;
+ private final List<MessageResult.Header> headers;
private final long size;
- public FullContent(final ByteBuffer contents, final List headers) {
+ public FullContent(final ByteBuffer contents, final List<MessageResult.Header> headers) {
this.contents = contents;
this.headers = headers;
this.size = caculateSize();
@@ -47,9 +47,8 @@
private long caculateSize() {
long result = contents.limit();
result += 2;
- for (final Iterator it = headers.iterator(); it.hasNext();) {
- final MessageResult.Header header = (MessageResult.Header) it
- .next();
+ for (final Iterator<MessageResult.Header> it = headers.iterator(); it.hasNext();) {
+ final MessageResult.Header header = it.next();
if (header != null) {
result += header.size();
result += 2;
@@ -64,9 +63,8 @@
public void writeTo(WritableByteChannel channel) throws IOException {
ByteBuffer newLine = ByteBuffer.wrap(ResultUtils.BYTES_NEW_LINE);
- for (final Iterator it = headers.iterator(); it.hasNext();) {
- final MessageResult.Header header = (MessageResult.Header) it
- .next();
+ for (final Iterator<MessageResult.Header> it = headers.iterator(); it.hasNext();) {
+ final MessageResult.Header header = it.next();
if (header != null) {
header.writeTo(channel);
}
Modified: james/imap/trunk/store/src/main/java/org/apache/james/imap/store/PartContentBuilder.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/PartContentBuilder.java?rev=897331&r1=897330&r2=897331&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/PartContentBuilder.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/imap/store/PartContentBuilder.java Fri Jan 8 21:55:38 2010
@@ -28,6 +28,7 @@
import org.apache.james.imap.mailbox.Content;
import org.apache.james.imap.mailbox.MessageResult;
+import org.apache.james.imap.mailbox.MessageResult.Header;
import org.apache.james.mime4j.MimeException;
import org.apache.james.mime4j.parser.MimeTokenStream;
@@ -118,7 +119,7 @@
}
public Content getFullContent() throws IOException, UnexpectedEOFException, MimeException {
- final List headers = getMimeHeaders();
+ final List<Header> headers = getMimeHeaders();
final byte[] content = mimeBodyContent();
return new FullContent(ByteBuffer.wrap(content), headers);
}
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=897331&r1=897330&r2=897331&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 Fri Jan 8 21:55:38 2010
@@ -59,7 +59,7 @@
*
* @return <code>Iterator</code> for message rows
*/
- public final Iterator iterateRows() {
+ public final Iterator<MailboxMembership> iterateRows() {
return messages.iterator();
}
Modified: james/imap/trunk/store/src/main/java/org/apache/james/imap/store/mail/MailboxMapper.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/mail/MailboxMapper.java?rev=897331&r1=897330&r2=897331&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/mail/MailboxMapper.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/imap/store/mail/MailboxMapper.java Fri Jan 8 21:55:38 2010
@@ -44,7 +44,6 @@
public abstract void delete(Mailbox mailbox) throws StorageException;
- @SuppressWarnings("unchecked")
public abstract List<Mailbox> findMailboxWithNameLike(String name)
throws StorageException;
Modified: james/imap/trunk/store/src/main/java/org/apache/james/imap/store/mail/MessageMapper.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/mail/MessageMapper.java?rev=897331&r1=897330&r2=897331&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/mail/MessageMapper.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/imap/store/mail/MessageMapper.java Fri Jan 8 21:55:38 2010
@@ -47,15 +47,12 @@
public abstract long countUnseenMessagesInMailbox()
throws StorageException;
- @SuppressWarnings("unchecked")
public abstract List<MailboxMembership> searchMailbox(SearchQuery query) throws StorageException;
public abstract void delete(MailboxMembership message) throws StorageException;
- @SuppressWarnings("unchecked")
public abstract List<MailboxMembership> findUnseenMessagesInMailboxOrderByUid() throws StorageException;
- @SuppressWarnings("unchecked")
public abstract List<MailboxMembership> findRecentMessagesInMailbox() throws StorageException;
public abstract void save(MailboxMembership message) throws StorageException;
Modified: james/imap/trunk/store/src/main/java/org/apache/james/imap/store/user/SubscriptionMapper.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/user/SubscriptionMapper.java?rev=897331&r1=897330&r2=897331&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/user/SubscriptionMapper.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/imap/store/user/SubscriptionMapper.java Fri Jan 8 21:55:38 2010
@@ -50,7 +50,6 @@
* @param user not null
* @return not null
*/
- @SuppressWarnings("unchecked")
public abstract List<Subscription> findSubscriptionsForUser(String user) throws SubscriptionException;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org