Author: rdonkin
Date: Thu Jul 23 17:29:27 2009
New Revision: 797155
URL: http://svn.apache.org/viewvc?rev=797155&view=rev
Log:
JSIEVE-59 Generification https://issues.apache.org/jira/browse/JSIEVE-59
Modified:
james/jsieve/trunk/mailet/src/main/java/org/apache/jsieve/mailet/SieveMailAdapter.java
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/StringListArgument.java
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/mail/MailAdapter.java
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/mail/MailUtils.java
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/tests/Exists.java
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/tests/Header.java
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapter.java
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapterActionsTest.java
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapterHeadersTest.java
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapterNoMessageSetTest.java
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/utils/SieveMailAdapter.java
james/jsieve/trunk/util/src/main/java/org/apache/jsieve/util/check/ScriptCheckMailAdapter.java
Modified:
james/jsieve/trunk/mailet/src/main/java/org/apache/jsieve/mailet/SieveMailAdapter.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/mailet/src/main/java/org/apache/jsieve/mailet/SieveMailAdapter.java?rev=797155&r1=797154&r2=797155&view=diff
==============================================================================
---
james/jsieve/trunk/mailet/src/main/java/org/apache/jsieve/mailet/SieveMailAdapter.java
(original)
+++
james/jsieve/trunk/mailet/src/main/java/org/apache/jsieve/mailet/SieveMailAdapter.java
Thu Jul 23 17:29:27 2009
@@ -196,12 +196,12 @@
/**
* @see org.apache.jsieve.mail.MailAdapter#getHeader(String)
*/
- public List getHeader(String name) throws SieveMailException
+ public List<String> getHeader(String name) throws SieveMailException
{
try
{
String[] headers = getMessage().getHeader(name);
- return (headers == null ? new ArrayList(0) :
Arrays.asList(headers));
+ return (headers == null ? new ArrayList<String>(0) :
Arrays.asList(headers));
}
catch (MessagingException ex)
{
@@ -211,9 +211,9 @@
/**
* @see org.apache.jsieve.mail.MailAdapter#getHeaderNames()
*/
- public List getHeaderNames() throws SieveMailException
+ public List<String> getHeaderNames() throws SieveMailException
{
- Set headerNames = new HashSet();
+ Set<String> headerNames = new HashSet<String>();
try
{
Enumeration allHeaders = getMessage().getAllHeaders();
@@ -221,7 +221,7 @@
{
headerNames.add(((Header) allHeaders.nextElement()).getName());
}
- return new ArrayList(headerNames);
+ return new ArrayList<String>(headerNames);
}
catch (MessagingException ex)
{
@@ -231,7 +231,7 @@
/**
* @see org.apache.jsieve.mail.MailAdapter#getMatchingHeader(String)
*/
- public List getMatchingHeader(String name) throws SieveMailException
+ public List<String> getMatchingHeader(String name) throws
SieveMailException
{
return MailUtils.getMatchingHeader(this, name);
}
@@ -254,9 +254,9 @@
*
* @return Map
*/
- protected Map getEnvelopes()
+ protected Map<String, String> getEnvelopes()
{
- Map envelopes = new HashMap(2);
+ Map<String, String> envelopes = new HashMap<String, String>(2);
if (null != getEnvelopeFrom())
envelopes.put("From", getEnvelopeFrom());
if (null != getEnvelopeTo())
@@ -266,10 +266,10 @@
/**
* @see
org.apache.jsieve.mail.optional.EnvelopeAccessors#getEnvelope(String)
*/
- public List getEnvelope(String name) throws SieveMailException
+ public List<String> getEnvelope(String name) throws SieveMailException
{
- List values = new ArrayList(1);
- Object value = getEnvelopes().get(name);
+ List<String> values = new ArrayList<String>(1);
+ String value = getEnvelopes().get(name);
if (null != value)
values.add(value);
return values;
@@ -277,20 +277,17 @@
/**
* @see
org.apache.jsieve.mail.optional.EnvelopeAccessors#getEnvelopeNames()
*/
- public List getEnvelopeNames() throws SieveMailException
+ public List<String> getEnvelopeNames() throws SieveMailException
{
- return new ArrayList(getEnvelopes().keySet());
+ return new ArrayList<String>(getEnvelopes().keySet());
}
/**
* @see
org.apache.jsieve.mail.optional.EnvelopeAccessors#getMatchingEnvelope(String)
*/
- public List getMatchingEnvelope(String name) throws SieveMailException
+ public List<String> getMatchingEnvelope(String name) throws
SieveMailException
{
- Iterator envelopeNamesIter = getEnvelopeNames().iterator();
- List matchedEnvelopeValues = new ArrayList(32);
- while (envelopeNamesIter.hasNext())
- {
- String envelopeName = (String) envelopeNamesIter.next();
+ final List<String> matchedEnvelopeValues = new ArrayList<String>(32);
+ for (String envelopeName: getEnvelopeNames()) {
if (envelopeName.trim().equalsIgnoreCase(name))
matchedEnvelopeValues.addAll(getEnvelope(envelopeName));
}
Modified:
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/StringListArgument.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/main/src/main/java/org/apache/jsieve/StringListArgument.java?rev=797155&r1=797154&r2=797155&view=diff
==============================================================================
---
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/StringListArgument.java
(original)
+++
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/StringListArgument.java
Thu Jul 23 17:29:27 2009
@@ -29,7 +29,7 @@
* <code>string-list = "[" string *("," string) "]" / string</code>
*/
public class StringListArgument implements Argument {
- private List fieldList;
+ private List<String> fieldList;
/**
* Constructor for StringListArgument.
@@ -41,7 +41,7 @@
/**
* Constructor for StringListArgument.
*/
- public StringListArgument(List stringList) {
+ public StringListArgument(List<String> stringList) {
this();
setList(stringList);
}
@@ -51,8 +51,8 @@
*
* @return List
*/
- public List getList() {
- List list = null;
+ public List<String> getList() {
+ List<String> list = null;
if (null == (list = getListBasic())) {
updateList();
return getList();
@@ -65,7 +65,7 @@
*
* @return List
*/
- private List getListBasic() {
+ private List<String> getListBasic() {
return fieldList;
}
@@ -74,8 +74,8 @@
*
* @return List
*/
- protected List computeList() {
- return new ArrayList();
+ protected List<String> computeList() {
+ return new ArrayList<String>();
}
/**
@@ -84,7 +84,7 @@
* @param list
* The list to set
*/
- protected void setList(List list) {
+ protected void setList(List<String> list) {
fieldList = list;
}
Modified:
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/mail/MailAdapter.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/main/src/main/java/org/apache/jsieve/mail/MailAdapter.java?rev=797155&r1=797154&r2=797155&view=diff
==============================================================================
---
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/mail/MailAdapter.java
(original)
+++
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/mail/MailAdapter.java
Thu Jul 23 17:29:27 2009
@@ -98,7 +98,7 @@
* unmodifiable
* @throws SieveMailException
*/
- public List getHeader(String name) throws SieveMailException;
+ public List<String> getHeader(String name) throws SieveMailException;
/**
* <p>
@@ -119,7 +119,7 @@
* unmodifiable
* @throws SieveMailException
*/
- public List getMatchingHeader(String name) throws SieveMailException;
+ public List<String> getMatchingHeader(String name) throws
SieveMailException;
/**
* Method getHeaderNames answers a List of all of the headers in the
@@ -129,7 +129,7 @@
* unmodifiable
* @throws SieveMailException
*/
- public List getHeaderNames() throws SieveMailException;
+ public List<String> getHeaderNames() throws SieveMailException;
/**
* Method addAction adds an Action to the List of Actions to be performed
by
Modified:
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/mail/MailUtils.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/main/src/main/java/org/apache/jsieve/mail/MailUtils.java?rev=797155&r1=797154&r2=797155&view=diff
==============================================================================
--- james/jsieve/trunk/main/src/main/java/org/apache/jsieve/mail/MailUtils.java
(original)
+++ james/jsieve/trunk/main/src/main/java/org/apache/jsieve/mail/MailUtils.java
Thu Jul 23 17:29:27 2009
@@ -20,7 +20,6 @@
package org.apache.jsieve.mail;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
/**
@@ -53,16 +52,13 @@
* @return List
* @throws SieveMailException
*/
- static public List getMatchingHeader(MailAdapter mail, String name)
- throws SieveMailException {
- Iterator headerNamesIter = mail.getHeaderNames().iterator();
- List matchedHeaderValues = new ArrayList(32);
- while (headerNamesIter.hasNext()) {
- String headerName = (String) headerNamesIter.next();
+ static public List<String> getMatchingHeader(MailAdapter mail, String name)
+ throws SieveMailException {;
+ final List<String> matchedHeaderValues = new ArrayList<String>(32);
+ for (String headerName: mail.getHeaderNames()) {
if (headerName.trim().equalsIgnoreCase(name))
matchedHeaderValues.addAll(mail.getHeader(headerName));
}
-
return matchedHeaderValues;
}
}
Modified:
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/tests/Exists.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/main/src/main/java/org/apache/jsieve/tests/Exists.java?rev=797155&r1=797154&r2=797155&view=diff
==============================================================================
--- james/jsieve/trunk/main/src/main/java/org/apache/jsieve/tests/Exists.java
(original)
+++ james/jsieve/trunk/main/src/main/java/org/apache/jsieve/tests/Exists.java
Thu Jul 23 17:29:27 2009
@@ -52,7 +52,7 @@
boolean found = true;
while (found && headerNamesIter.hasNext()) {
- List headers = mail.getMatchingHeader((String) headerNamesIter
+ List<String> headers = mail.getMatchingHeader((String)
headerNamesIter
.next());
found = found && !headers.isEmpty();
}
Modified:
james/jsieve/trunk/main/src/main/java/org/apache/jsieve/tests/Header.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/main/src/main/java/org/apache/jsieve/tests/Header.java?rev=797155&r1=797154&r2=797155&view=diff
==============================================================================
--- james/jsieve/trunk/main/src/main/java/org/apache/jsieve/tests/Header.java
(original)
+++ james/jsieve/trunk/main/src/main/java/org/apache/jsieve/tests/Header.java
Thu Jul 23 17:29:27 2009
@@ -68,8 +68,8 @@
SieveContext context) throws SieveException {
String comparator = null;
String matchType = null;
- List headerNames = null;
- List keys = null;
+ List<String> headerNames = null;
+ List<String> keys = null;
ListIterator argumentsIter =
arguments.getArgumentList().listIterator();
boolean stop = false;
@@ -154,7 +154,7 @@
* @throws SieveException
*/
protected boolean match(MailAdapter mail, String comparator,
- String matchType, List headerNames, List keys, SieveContext
context)
+ String matchType, List<String> headerNames, List<String> keys,
SieveContext context)
throws SieveException {
// Iterate over the header names looking for a match
boolean isMatched = false;
@@ -180,7 +180,7 @@
* @throws SieveException
*/
protected boolean match(String comparator, String matchType,
- List headerValues, List keys, SieveContext context)
+ List<String> headerValues, List<String> keys, SieveContext context)
throws SieveException {
// Special case for empty values
// If the matchType is :contains
@@ -190,7 +190,7 @@
if (headerValues.isEmpty())
if (matchType.equals(CONTAINS_TAG)) {
// header values may be immutable
- headerValues = new ArrayList(headerValues);
+ headerValues = new ArrayList<String>(headerValues);
headerValues.add("");
} else {
return false;
@@ -218,15 +218,16 @@
* @throws SieveException
*/
protected boolean match(String comparator, String matchType,
- String headerValue, List keys, SieveContext context)
+ String headerValue, List<String> keys, SieveContext context)
throws SieveException {
// Iterate over the keys looking for a match
boolean isMatched = false;
- Iterator keysIter = keys.iterator();
- while (!isMatched && keysIter.hasNext()) {
- final String nextKey = (String) keysIter.next();
+ for (final String key: keys) {
isMatched = ComparatorUtils.match(comparator, matchType,
- headerValue, nextKey, context);
+ headerValue, key, context);
+ if (isMatched) {
+ break;
+ }
}
return isMatched;
}
Modified:
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapter.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/main/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapter.java?rev=797155&r1=797154&r2=797155&view=diff
==============================================================================
---
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapter.java
(original)
+++
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapter.java
Thu Jul 23 17:29:27 2009
@@ -45,15 +45,15 @@
*/
public class ScriptCheckMailAdapter implements MailAdapter {
- private final List actions;
+ private final List<Action> actions;
- private final List executedActions;
+ private final List<Action> executedActions;
private Message mail = null;
public ScriptCheckMailAdapter() {
- actions = new ArrayList();
- executedActions = new ArrayList();
+ actions = new ArrayList<Action>();
+ executedActions = new ArrayList<Action>();
}
/**
@@ -102,8 +102,8 @@
* @return <code>List</code> of {...@link Action}s, not null. This list is
a
* modifiable copy
*/
- public List getExecutedActions() {
- final ArrayList result = new ArrayList(executedActions);
+ public List<Action> getExecutedActions() {
+ final ArrayList<Action> result = new
ArrayList<Action>(executedActions);
return result;
}
@@ -114,8 +114,8 @@
* @return <code>List</code> of {...@link Action}'s, not null, possibly
* unmodifiable
*/
- public List getActions() {
- final List result = Collections.unmodifiableList(actions);
+ public List<Action> getActions() {
+ final List<Action> result = Collections.unmodifiableList(actions);
return result;
}
@@ -150,8 +150,9 @@
* @return <code>List</code> not null, possibly empty
* @throws SieveMailException
*/
- public List getHeader(String name) throws SieveMailException {
- List result = Collections.EMPTY_LIST;
+ @SuppressWarnings("unchecked")
+ public List<String> getHeader(String name) throws SieveMailException {
+ List<String> result = Collections.EMPTY_LIST;
if (mail != null) {
try {
String[] values = mail.getHeader(name);
@@ -173,11 +174,12 @@
* unmodifiable
* @throws SieveMailException
*/
- public List getHeaderNames() throws SieveMailException {
- List results = Collections.EMPTY_LIST;
+ @SuppressWarnings("unchecked")
+ public List<String> getHeaderNames() throws SieveMailException {
+ List<String> results = Collections.EMPTY_LIST;
if (mail != null) {
try {
- results = new ArrayList();
+ results = new ArrayList<String>();
for (final Enumeration en = mail.getAllHeaders(); en
.hasMoreElements();) {
final Header header = (Header) en.nextElement();
@@ -211,8 +213,9 @@
* @return <code>List</code>, not null possibly empty
* @throws SieveMailException
*/
- public List getMatchingHeader(String name) throws SieveMailException {
- List result = Collections.EMPTY_LIST;
+ @SuppressWarnings("unchecked")
+ public List<String> getMatchingHeader(String name) throws
SieveMailException {
+ List<String> result = Collections.EMPTY_LIST;
if (mail != null) {
result = MailUtils.getMatchingHeader(this, name);
}
Modified:
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapterActionsTest.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/main/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapterActionsTest.java?rev=797155&r1=797154&r2=797155&view=diff
==============================================================================
---
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapterActionsTest.java
(original)
+++
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapterActionsTest.java
Thu Jul 23 17:29:27 2009
@@ -68,7 +68,7 @@
public void testGetActions() {
assertNotNull(adapter.getActions());
try {
- adapter.getActions().add("A Little Extra");
+ adapter.getActions().add(new Action() {});
fail("Should not be able to modify collection");
} catch (UnsupportedOperationException e) {
// expected
@@ -137,7 +137,7 @@
.getExecutedActions().get(0));
assertEquals("Two actions executed", anotherAction, adapter
.getExecutedActions().get(1));
- adapter.getExecutedActions().add("Whatever");
+ adapter.getExecutedActions().add(new Action(){});
assertEquals("Two actions executed", 2, adapter.getExecutedActions()
.size());
assertEquals("Two actions executed", action, adapter
Modified:
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapterHeadersTest.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/main/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapterHeadersTest.java?rev=797155&r1=797154&r2=797155&view=diff
==============================================================================
---
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapterHeadersTest.java
(original)
+++
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapterHeadersTest.java
Thu Jul 23 17:29:27 2009
@@ -72,7 +72,7 @@
}
public void testGetHeader() throws Exception {
- List headers = adapter.getHeader(FROM);
+ List<String> headers = adapter.getHeader(FROM);
assertNotNull(headers);
assertEquals("From header", 1, headers.size());
assertEquals("From header", FROM_ADDRESS, headers.get(0));
Modified:
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapterNoMessageSetTest.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/main/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapterNoMessageSetTest.java?rev=797155&r1=797154&r2=797155&view=diff
==============================================================================
---
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapterNoMessageSetTest.java
(original)
+++
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapterNoMessageSetTest.java
Thu Jul 23 17:29:27 2009
@@ -33,7 +33,7 @@
}
public void testGetHeader() throws Exception {
- List headers = adapter.getHeader("From");
+ List<String> headers = adapter.getHeader("From");
assertNotNull(headers);
}
Modified:
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/utils/SieveMailAdapter.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/main/src/test/java/org/apache/jsieve/utils/SieveMailAdapter.java?rev=797155&r1=797154&r2=797155&view=diff
==============================================================================
---
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/utils/SieveMailAdapter.java
(original)
+++
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/utils/SieveMailAdapter.java
Thu Jul 23 17:29:27 2009
@@ -185,10 +185,10 @@
/**
* @see org.apache.jsieve.mail.MailAdapter#getHeader(String)
*/
- public List getHeader(String name) throws SieveMailException {
+ public List<String> getHeader(String name) throws SieveMailException {
try {
String[] headers = getMessage().getHeader(name);
- return (headers == null ? new ArrayList(0) :
Arrays.asList(headers));
+ return (headers == null ? new ArrayList<String>(0) :
Arrays.asList(headers));
} catch (MessagingException ex) {
throw new SieveMailException(ex);
}
@@ -197,14 +197,14 @@
/**
* @see org.apache.jsieve.mail.MailAdapter#getHeaderNames()
*/
- public List getHeaderNames() throws SieveMailException {
- Set headerNames = new HashSet();
+ public List<String> getHeaderNames() throws SieveMailException {
+ Set<String> headerNames = new HashSet<String>();
try {
Enumeration allHeaders = getMessage().getAllHeaders();
while (allHeaders.hasMoreElements()) {
headerNames.add(((Header) allHeaders.nextElement()).getName());
}
- return new ArrayList(headerNames);
+ return new ArrayList<String>(headerNames);
} catch (MessagingException ex) {
throw new SieveMailException(ex);
}
@@ -213,7 +213,7 @@
/**
* @see org.apache.jsieve.mail.MailAdapter#getMatchingHeader(String)
*/
- public List getMatchingHeader(String name) throws SieveMailException {
+ public List<String> getMatchingHeader(String name) throws
SieveMailException {
return MailUtils.getMatchingHeader(this, name);
}
Modified:
james/jsieve/trunk/util/src/main/java/org/apache/jsieve/util/check/ScriptCheckMailAdapter.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/util/src/main/java/org/apache/jsieve/util/check/ScriptCheckMailAdapter.java?rev=797155&r1=797154&r2=797155&view=diff
==============================================================================
---
james/jsieve/trunk/util/src/main/java/org/apache/jsieve/util/check/ScriptCheckMailAdapter.java
(original)
+++
james/jsieve/trunk/util/src/main/java/org/apache/jsieve/util/check/ScriptCheckMailAdapter.java
Thu Jul 23 17:29:27 2009
@@ -213,8 +213,9 @@
* @return <code>List</code>, not null possibly empty
* @throws SieveMailException
*/
- public List getMatchingHeader(String name) throws SieveMailException {
- List result = Collections.EMPTY_LIST;
+ @SuppressWarnings("unchecked")
+ public List<String> getMatchingHeader(String name) throws
SieveMailException {
+ List<String> result = Collections.EMPTY_LIST;
if (mail != null) {
result = MailUtils.getMatchingHeader(this, name);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
