You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ng...@apache.org on 2011/02/09 00:01:27 UTC
svn commit: r1068670 - in /mina/vysper/trunk/server/core/src:
main/java/org/apache/vysper/xmpp/datetime/
main/java/org/apache/vysper/xmpp/delivery/
main/java/org/apache/vysper/xmpp/modules/core/session/handler/
main/java/org/apache/vysper/xmpp/modules/...
Author: ngn
Date: Tue Feb 8 23:01:26 2011
New Revision: 1068670
URL: http://svn.apache.org/viewvc?rev=1068670&view=rev
Log:
Fixing minor issues reported by Findbugs
Modified:
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/datetime/DateTimeProfile.java
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/delivery/RecordingStanzaRelay.java
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/session/handler/SessionIQHandler.java
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0160_offline_storage/MemoryOfflineStorageProvider.java
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/Identity.java
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/InfoDataForm.java
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/StanzaBuilder.java
mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AbortHandlerTestCase.java
mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolInitiatedTestCase.java
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/datetime/DateTimeProfile.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/datetime/DateTimeProfile.java?rev=1068670&r1=1068669&r2=1068670&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/datetime/DateTimeProfile.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/datetime/DateTimeProfile.java Tue Feb 8 23:01:26 2011
@@ -22,13 +22,13 @@ package org.apache.vysper.xmpp.datetime;
import static org.apache.vysper.compliance.SpecCompliant.ComplianceCoverage.COMPLETE;
import static org.apache.vysper.compliance.SpecCompliant.ComplianceStatus.IN_PROGRESS;
-import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import java.util.TimeZone;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.apache.commons.lang.time.FastDateFormat;
import org.apache.vysper.compliance.SpecCompliant;
/**
@@ -39,11 +39,11 @@ public class DateTimeProfile {
protected static final TimeZone TIME_ZONE_UTC;
- protected static final SimpleDateFormat utcDateFormatter;
+ protected static final FastDateFormat utcDateFormatter;
- protected static final SimpleDateFormat utcDateTimeFormatter;
+ protected static final FastDateFormat utcDateTimeFormatter;
- protected static final SimpleDateFormat utcTimeFormatter;
+ protected static final FastDateFormat utcTimeFormatter;
private static final String DATE_PATTERN_VALUE = "(\\d\\d\\d\\d)-(\\d\\d)-(\\d\\d)";
@@ -62,12 +62,9 @@ public class DateTimeProfile {
static {
TIME_ZONE_UTC = TimeZone.getTimeZone("UTC");
- utcDateTimeFormatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
- utcDateTimeFormatter.setTimeZone(TIME_ZONE_UTC); // convert to UTC
- utcDateFormatter = new SimpleDateFormat("yyyy-MM-dd");
- utcDateFormatter.setTimeZone(TIME_ZONE_UTC); // convert to UTC
- utcTimeFormatter = new SimpleDateFormat("HH:mm:ss'Z'");
- utcTimeFormatter.setTimeZone(TIME_ZONE_UTC); // convert to UTC
+ utcDateTimeFormatter = FastDateFormat.getInstance("yyyy-MM-dd'T'HH:mm:ss'Z'", TIME_ZONE_UTC);
+ utcDateFormatter = FastDateFormat.getInstance("yyyy-MM-dd", TIME_ZONE_UTC);
+ utcTimeFormatter = FastDateFormat.getInstance("HH:mm:ss'Z'", TIME_ZONE_UTC);
}
private final static DateTimeProfile SINGLETON = new DateTimeProfile();
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/delivery/RecordingStanzaRelay.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/delivery/RecordingStanzaRelay.java?rev=1068670&r1=1068669&r2=1068670&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/delivery/RecordingStanzaRelay.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/delivery/RecordingStanzaRelay.java Tue Feb 8 23:01:26 2011
@@ -63,7 +63,7 @@ public class RecordingStanzaRelay implem
this.acceptingMode = accepting;
}
- public class Triple {
+ public static class Triple {
private Entity entity;
private Stanza stanza;
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/session/handler/SessionIQHandler.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/session/handler/SessionIQHandler.java?rev=1068670&r1=1068669&r2=1068670&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/session/handler/SessionIQHandler.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/session/handler/SessionIQHandler.java Tue Feb 8 23:01:26 2011
@@ -53,10 +53,8 @@ public class SessionIQHandler extends IQ
case GET:
case ERROR:
default:
- new RuntimeException("iq stanza type not supported: " + stanza.getIQType());
+ throw new RuntimeException("iq stanza type not supported: " + stanza.getIQType());
}
-
- return null;
}
}
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0160_offline_storage/MemoryOfflineStorageProvider.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0160_offline_storage/MemoryOfflineStorageProvider.java?rev=1068670&r1=1068669&r2=1068670&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0160_offline_storage/MemoryOfflineStorageProvider.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0160_offline_storage/MemoryOfflineStorageProvider.java Tue Feb 8 23:01:26 2011
@@ -82,7 +82,7 @@ public class MemoryOfflineStorageProvide
}
}
- private class Entry {
+ private static class Entry {
private Stanza stanza;
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/Identity.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/Identity.java?rev=1068670&r1=1068669&r2=1068670&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/Identity.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/Identity.java Tue Feb 8 23:01:26 2011
@@ -29,7 +29,7 @@ import org.apache.vysper.xmpp.stanza.Sta
*/
public class Identity implements InfoElement {
- private static final Integer CLASS_ID = new Integer(1);
+ private static final Integer CLASS_ID = 1;
protected String category; // required
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/InfoDataForm.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/InfoDataForm.java?rev=1068670&r1=1068669&r2=1068670&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/InfoDataForm.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/InfoDataForm.java Tue Feb 8 23:01:26 2011
@@ -34,7 +34,7 @@ import org.apache.vysper.xmpp.stanza.dat
@SpecCompliant(spec = "XEP-0128", status = FINISHED, coverage = COMPLETE)
public class InfoDataForm implements InfoElement {
- private static final Integer CLASS_ID = new Integer(3);
+ private static final Integer CLASS_ID = 3;
protected static final DataFormEncoder DATA_FORM_ENCODER = new DataFormEncoder();
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/StanzaBuilder.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/StanzaBuilder.java?rev=1068670&r1=1068669&r2=1068670&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/StanzaBuilder.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/StanzaBuilder.java Tue Feb 8 23:01:26 2011
@@ -251,7 +251,7 @@ public class StanzaBuilder extends Abstr
}
}
- class ElementStruct {
+ static class ElementStruct {
public ElementStruct parentElement = null;
public XMLElement element = null;
Modified: mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AbortHandlerTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AbortHandlerTestCase.java?rev=1068670&r1=1068669&r2=1068670&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AbortHandlerTestCase.java (original)
+++ mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AbortHandlerTestCase.java Tue Feb 8 23:01:26 2011
@@ -72,7 +72,6 @@ public class AbortHandlerTestCase extend
executeAbortAuthorization_3Times();
StanzaBuilder stanzaBuilder = createAbort();
- Stanza abortPlainStanza = stanzaBuilder.build();
stanzaBuilder = new StanzaBuilder("auth", NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_SASL);
stanzaBuilder.addAttribute("mechanism", "PLAIN");
Modified: mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolInitiatedTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolInitiatedTestCase.java?rev=1068670&r1=1068669&r2=1068670&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolInitiatedTestCase.java (original)
+++ mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolInitiatedTestCase.java Tue Feb 8 23:01:26 2011
@@ -118,7 +118,7 @@ public class ProtocolInitiatedTestCase e
assertFalse("no error", responseVerifier.subElementPresent("error"));
}
- protected class IllegalXMPPVersion extends XMPPVersion {
+ protected static class IllegalXMPPVersion extends XMPPVersion {
protected String versionString;
public IllegalXMPPVersion(String version) {