Author: bago
Date: Wed Sep 15 20:49:09 2010
New Revision: 997499
URL: http://svn.apache.org/viewvc?rev=997499&view=rev
Log:
Minor java2 1.4 => java5 updates (JDKIM-21)
Thanks to Ben Aldrich for reporting.
Modified:
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/DKIMCommon.java
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/DKIMVerifier.java
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/DNSPublicKeyRecordRetriever.java
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/tagvalue/SignatureRecordImpl.java
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/tagvalue/TagValue.java
Modified:
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/DKIMCommon.java
URL:
http://svn.apache.org/viewvc/james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/DKIMCommon.java?rev=997499&r1=997498&r2=997499&view=diff
==============================================================================
--- james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/DKIMCommon.java
(original)
+++ james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/DKIMCommon.java
Wed Sep 15 20:49:09 2010
@@ -85,7 +85,7 @@ public abstract class DKIMCommon {
if (hl != null && hl.size() > 0) {
Integer done = processedHeader.get(header.toString());
if (done == null)
- done = new Integer(0); /* Integer.valueOf(0) */
+ done = Integer.valueOf(0);
int doneHeaders = done.intValue() + 1;
if (doneHeaders <= hl.size()) {
String fv = hl.get(hl.size() - doneHeaders);
Modified:
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/DKIMVerifier.java
URL:
http://svn.apache.org/viewvc/james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/DKIMVerifier.java?rev=997499&r1=997498&r2=997499&view=diff
==============================================================================
---
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/DKIMVerifier.java
(original)
+++
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/DKIMVerifier.java
Wed Sep 15 20:49:09 2010
@@ -86,7 +86,7 @@ public class DKIMVerifier extends DKIMCo
public PublicKeyRecord publicKeySelector(List<String> records)
throws PermFailException {
String lastError = null;
- if (records == null || records.size() == 0) {
+ if (records == null || records.isEmpty()) {
lastError = "no key for signature";
} else {
for (Iterator<String> i = records.iterator(); i.hasNext();) {
@@ -245,7 +245,7 @@ public class DKIMVerifier extends DKIMCo
// System.out.println(message.getFields("DKIM-Signature"));
List<String> fields = messageHeaders.getFields("DKIM-Signature");
// if (fields.size() > 1) throw new RuntimeException("here we are!");
- if (fields == null || fields.size() == 0) {
+ if (fields == null || fields.isEmpty()) {
throw new PermFailException("DKIM-Signature field not found");
}
@@ -323,7 +323,7 @@ public class DKIMVerifier extends DKIMCo
}
OutputStream o;
- if (bodyHashJobs.size() == 0) {
+ if (bodyHashJobs.isEmpty()) {
throw prepareException(signatureExceptions);
} else if (bodyHashJobs.size() == 1) {
o = ((BodyHasher) bodyHashJobs.values().iterator().next())
@@ -353,7 +353,7 @@ public class DKIMVerifier extends DKIMCo
}
}
- if (verifiedSignatures.size() == 0) {
+ if (verifiedSignatures.isEmpty()) {
throw prepareException(signatureExceptions);
} else {
// There is no access to the signatureExceptions when
Modified:
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/DNSPublicKeyRecordRetriever.java
URL:
http://svn.apache.org/viewvc/james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/DNSPublicKeyRecordRetriever.java?rev=997499&r1=997498&r2=997499&view=diff
==============================================================================
---
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/DNSPublicKeyRecordRetriever.java
(original)
+++
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/DNSPublicKeyRecordRetriever.java
Wed Sep 15 20:49:09 2010
@@ -99,7 +99,7 @@ public class DNSPublicKeyRecordRetriever
// ""));
records.add(((String) txt.getStrings().get(0)));
} else {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for (Iterator<String> it = txt.getStrings()
.iterator(); it.hasNext();) {
String k = it.next();
Modified:
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/tagvalue/SignatureRecordImpl.java
URL:
http://svn.apache.org/viewvc/james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/tagvalue/SignatureRecordImpl.java?rev=997499&r1=997498&r2=997499&view=diff
==============================================================================
---
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/tagvalue/SignatureRecordImpl.java
(original)
+++
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/tagvalue/SignatureRecordImpl.java
Wed Sep 15 20:49:09 2010
@@ -161,7 +161,7 @@ public class SignatureRecordImpl extends
public static String dkimQuotedPrintableDecode(CharSequence input)
throws IllegalArgumentException {
- StringBuffer sb = new StringBuffer(input.length());
+ StringBuilder sb = new StringBuilder(input.length());
// TODO should we fail on WSP that is not part of FWS?
// the specification in 2.6 DKIM-Quoted-Printable is not
// clear
Modified:
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/tagvalue/TagValue.java
URL:
http://svn.apache.org/viewvc/james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/tagvalue/TagValue.java?rev=997499&r1=997498&r2=997499&view=diff
==============================================================================
---
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/tagvalue/TagValue.java
(original)
+++
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/tagvalue/TagValue.java
Wed Sep 15 20:49:09 2010
@@ -277,7 +277,7 @@ public class TagValue {
private void updateStringRepresentation() {
// calculate a new string representation
- StringBuffer res = new StringBuffer();
+ StringBuilder res = new StringBuilder();
Set<String> s = getTags();
for (Iterator<String> i = s.iterator(); i.hasNext();) {
String tag = i.next();
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
