Fixing minor issues reported by Findbugs
git-svn-id: https://svn.apache.org/repos/asf/mina/vysper/trunk@1068670 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/server/core/src/main/java/org/apache/vysper/xmpp/datetime/DateTimeProfile.java b/server/core/src/main/java/org/apache/vysper/xmpp/datetime/DateTimeProfile.java
index 2c96bf0..21377b4 100644
--- a/server/core/src/main/java/org/apache/vysper/xmpp/datetime/DateTimeProfile.java
+++ b/server/core/src/main/java/org/apache/vysper/xmpp/datetime/DateTimeProfile.java
@@ -22,13 +22,13 @@
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 @@
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 @@
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();
diff --git a/server/core/src/main/java/org/apache/vysper/xmpp/delivery/RecordingStanzaRelay.java b/server/core/src/main/java/org/apache/vysper/xmpp/delivery/RecordingStanzaRelay.java
index 166a211..fd4be60 100644
--- a/server/core/src/main/java/org/apache/vysper/xmpp/delivery/RecordingStanzaRelay.java
+++ b/server/core/src/main/java/org/apache/vysper/xmpp/delivery/RecordingStanzaRelay.java
@@ -63,7 +63,7 @@
this.acceptingMode = accepting;
}
- public class Triple {
+ public static class Triple {
private Entity entity;
private Stanza stanza;
diff --git a/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/session/handler/SessionIQHandler.java b/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/session/handler/SessionIQHandler.java
index e45963d..c8a2195 100644
--- a/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/session/handler/SessionIQHandler.java
+++ b/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/session/handler/SessionIQHandler.java
@@ -53,10 +53,8 @@
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;
}
}
diff --git a/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0160_offline_storage/MemoryOfflineStorageProvider.java b/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0160_offline_storage/MemoryOfflineStorageProvider.java
index c3a34ea..ca3c97e 100644
--- a/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0160_offline_storage/MemoryOfflineStorageProvider.java
+++ b/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0160_offline_storage/MemoryOfflineStorageProvider.java
@@ -82,7 +82,7 @@
}
}
- private class Entry {
+ private static class Entry {
private Stanza stanza;
diff --git a/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/Identity.java b/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/Identity.java
index 7787250..7ccc471 100644
--- a/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/Identity.java
+++ b/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/Identity.java
@@ -29,7 +29,7 @@
*/
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
diff --git a/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/InfoDataForm.java b/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/InfoDataForm.java
index 53ea8be..4fa4d2f 100644
--- a/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/InfoDataForm.java
+++ b/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/InfoDataForm.java
@@ -34,7 +34,7 @@
@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();
diff --git a/server/core/src/main/java/org/apache/vysper/xmpp/stanza/StanzaBuilder.java b/server/core/src/main/java/org/apache/vysper/xmpp/stanza/StanzaBuilder.java
index 88b94bf..da697a1 100644
--- a/server/core/src/main/java/org/apache/vysper/xmpp/stanza/StanzaBuilder.java
+++ b/server/core/src/main/java/org/apache/vysper/xmpp/stanza/StanzaBuilder.java
@@ -251,7 +251,7 @@
}
}
- class ElementStruct {
+ static class ElementStruct {
public ElementStruct parentElement = null;
public XMLElement element = null;
diff --git a/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AbortHandlerTestCase.java b/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AbortHandlerTestCase.java
index c43708c..814279f 100644
--- a/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AbortHandlerTestCase.java
+++ b/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AbortHandlerTestCase.java
@@ -72,7 +72,6 @@
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");
diff --git a/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolInitiatedTestCase.java b/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolInitiatedTestCase.java
index 92c06c7..b413718 100644
--- a/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolInitiatedTestCase.java
+++ b/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolInitiatedTestCase.java
@@ -118,7 +118,7 @@
assertFalse("no error", responseVerifier.subElementPresent("error"));
}
- protected class IllegalXMPPVersion extends XMPPVersion {
+ protected static class IllegalXMPPVersion extends XMPPVersion {
protected String versionString;
public IllegalXMPPVersion(String version) {
