You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by be...@apache.org on 2008/06/27 22:49:37 UTC
svn commit: r672387 - in /labs/vysper/src:
main/java/org/apache/vysper/mina/codec/ main/java/org/apache/vysper/spring/
main/java/org/apache/vysper/xmpp/addressing/
main/java/org/apache/vysper/xmpp/delivery/failure/
main/java/org/apache/vysper/xmpp/modu...
Author: berndf
Date: Fri Jun 27 13:49:36 2008
New Revision: 672387
URL: http://svn.apache.org/viewvc?rev=672387&view=rev
Log:
[vysper] purely cosmetical: add @Override where appropriate, removed some unused imports
Removed:
labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/bind/handler/IQBindHandler.java
labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/compatibility/jabber_iq_auth/handler/IQAuthCompatibilityHandler.java
labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/session/handler/IQSessionHandler.java
Modified:
labs/vysper/src/main/java/org/apache/vysper/mina/codec/XMLStreamTokenizer.java
labs/vysper/src/main/java/org/apache/vysper/spring/ResourceBasedTLSContextFactory.java
labs/vysper/src/main/java/org/apache/vysper/xmpp/addressing/EntityImpl.java
labs/vysper/src/main/java/org/apache/vysper/xmpp/delivery/failure/ReturnErrorToSenderFailureStrategy.java
labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/IQHandler.java
labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/MessageHandler.java
labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/bind/handler/BindIQHandler.java
labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/compatibility/jabber_iq_auth/handler/AuthCompatibilityIQHandler.java
labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceHandler.java
labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AuthHandler.java
labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/session/handler/SessionIQHandler.java
labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/roster/handler/RosterIQHandler.java
labs/vysper/src/main/java/org/apache/vysper/xmpp/parser/StringStreamParser.java
labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/worker/AuthenticatedProtocolWorker.java
labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/worker/EncryptedProtocolWorker.java
labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/worker/EncryptionStartedProtocolWorker.java
labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/worker/EndOrClosedProtocolWorker.java
labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/worker/InitiatedProtocolWorker.java
labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/worker/StartedProtocolWorker.java
labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/worker/UnconnectedProtocolWorker.java
labs/vysper/src/main/java/org/apache/vysper/xmpp/security/BogusTrustManagerFactory.java
labs/vysper/src/main/java/org/apache/vysper/xmpp/security/FileBasedTLSContextFactory.java
labs/vysper/src/main/java/org/apache/vysper/xmpp/stanza/IQStanza.java
labs/vysper/src/main/java/org/apache/vysper/xmpp/stanza/PresenceStanza.java
labs/vysper/src/main/java/org/apache/vysper/xmpp/stanza/XMPPCoreStanza.java
labs/vysper/src/main/java/org/apache/vysper/xmpp/xmlfragment/XMLElement.java
labs/vysper/src/main/java/org/apache/vysper/xmpp/xmlfragment/XMLText.java
labs/vysper/src/test/java/org/apache/vysper/mina/codec/MockIoSession.java
labs/vysper/src/test/java/org/apache/vysper/stanzasession/StanzaSessionTestCase.java
labs/vysper/src/test/java/org/apache/vysper/xmpp/modules/core/base/handler/IQHandlerTestCase.java
labs/vysper/src/test/java/org/apache/vysper/xmpp/modules/core/base/handler/MessageHandlerRelayTestCase.java
labs/vysper/src/test/java/org/apache/vysper/xmpp/modules/core/base/handler/TestIQHandler.java
labs/vysper/src/test/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceHandlerTestCase.java
labs/vysper/src/test/java/org/apache/vysper/xmpp/modules/core/starttls/handler/StartTLSHandlerTestCase.java
labs/vysper/src/test/java/org/apache/vysper/xmpp/modules/roster/handler/RosterIQHandlerTestCase.java
labs/vysper/src/test/java/org/apache/vysper/xmpp/parser/StringStreamParserTestCase.java
labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/CallTestStanzaHandlerResponse.java
labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolEncryptedTestCase.java
labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolEncryptionStartedTestCase.java
labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolInitiatedTestCase.java
labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolStartedTestCase.java
labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolStateTestCase.java
labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerAquireTestCase.java
labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerProcessTestCase.java
labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerStateAwarenessTestCase.java
labs/vysper/src/test/java/org/apache/vysper/xmpp/server/TestSessionContext.java
labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragementConverterConvertErrorTestCase.java
labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragementConverterConvertTestCase.java
Modified: labs/vysper/src/main/java/org/apache/vysper/mina/codec/XMLStreamTokenizer.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/mina/codec/XMLStreamTokenizer.java?rev=672387&r1=672386&r2=672387&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/mina/codec/XMLStreamTokenizer.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/mina/codec/XMLStreamTokenizer.java Fri Jun 27 13:49:36 2008
@@ -20,15 +20,14 @@
import org.apache.mina.common.IoSession;
import org.apache.mina.filter.codec.CumulativeProtocolDecoder;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
+import org.apache.vysper.charset.CharsetUtil;
+import org.apache.vysper.xmpp.writer.DenseStanzaLogRenderer;
+import org.apache.vysper.xmpp.xmldecoder.DecodingException;
import org.apache.vysper.xmpp.xmldecoder.ParticleDecoder;
import org.apache.vysper.xmpp.xmldecoder.XMLParticle;
import org.apache.vysper.xmpp.xmldecoder.XMLRawToFragementConverter;
-import org.apache.vysper.xmpp.xmldecoder.DecodingException;
import org.apache.vysper.xmpp.xmlfragment.XMLElement;
import org.apache.vysper.xmpp.xmlfragment.XMLFragment;
-import org.apache.vysper.xmpp.xmlfragment.XMLText;
-import org.apache.vysper.xmpp.writer.DenseStanzaLogRenderer;
-import org.apache.vysper.charset.CharsetUtil;
import java.util.ArrayList;
import java.util.List;
@@ -41,6 +40,7 @@
public static final String SESSION_ATTRIBUTE_NAME = "tokenizerParticleList";
private static final XMLRawToFragementConverter CONVERTER = new XMLRawToFragementConverter();
+ @Override
public boolean doDecode(IoSession ioSession, ByteBuffer byteBuffer, ProtocolDecoderOutput protocolDecoderOutput) throws Exception {
XMLParticle xmlParticle = ParticleDecoder.decodeParticle(byteBuffer, CharsetUtil.UTF8_DECODER);
@@ -73,7 +73,7 @@
protocolDecoderOutput.write(element);
} else {
// TODO handle text elements properly might be only whitespaces/newlines
- protocolDecoderOutput.write((XMLText)xmlFragment);
+ protocolDecoderOutput.write(xmlFragment);
}
}
} catch (DecodingException e) {
Modified: labs/vysper/src/main/java/org/apache/vysper/spring/ResourceBasedTLSContextFactory.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/spring/ResourceBasedTLSContextFactory.java?rev=672387&r1=672386&r2=672387&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/spring/ResourceBasedTLSContextFactory.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/spring/ResourceBasedTLSContextFactory.java Fri Jun 27 13:49:36 2008
@@ -32,6 +32,7 @@
this.certificateResource = certificateResource;
}
+ @Override
protected InputStream getCertificateInputStream() throws IOException {
return certificateResource.getInputStream();
}
Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/addressing/EntityImpl.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/addressing/EntityImpl.java?rev=672387&r1=672386&r2=672387&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/addressing/EntityImpl.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/addressing/EntityImpl.java Fri Jun 27 13:49:36 2008
@@ -111,6 +111,7 @@
}
+ @Override
public boolean equals(Object o) {
if (this == o)
return true;
@@ -132,7 +133,8 @@
return true;
}
- public int hashCode() {
+ @Override
+ public int hashCode() {
int result;
result = (node != null ? node.hashCode() : 0);
result = 29 * result + (domain != null ? domain.hashCode() : 0);
Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/delivery/failure/ReturnErrorToSenderFailureStrategy.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/delivery/failure/ReturnErrorToSenderFailureStrategy.java?rev=672387&r1=672386&r2=672387&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/delivery/failure/ReturnErrorToSenderFailureStrategy.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/delivery/failure/ReturnErrorToSenderFailureStrategy.java Fri Jun 27 13:49:36 2008
@@ -16,14 +16,16 @@
***********************************************************************/
package org.apache.vysper.xmpp.delivery.failure;
-import org.apache.vysper.xmpp.addressing.Entity;
-import org.apache.vysper.xmpp.addressing.EntityImpl;
import org.apache.vysper.xmpp.delivery.DeliveryException;
import org.apache.vysper.xmpp.delivery.DeliveryFailureStrategy;
import org.apache.vysper.xmpp.delivery.LocalRecipientNotReachableException;
import org.apache.vysper.xmpp.delivery.StanzaRelay;
import org.apache.vysper.xmpp.server.response.ServerErrorResponses;
-import org.apache.vysper.xmpp.stanza.*;
+import org.apache.vysper.xmpp.stanza.MessageStanza;
+import org.apache.vysper.xmpp.stanza.Stanza;
+import org.apache.vysper.xmpp.stanza.StanzaErrorCondition;
+import org.apache.vysper.xmpp.stanza.StanzaErrorType;
+import org.apache.vysper.xmpp.stanza.XMPPCoreStanza;
/**
*/
Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/IQHandler.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/IQHandler.java?rev=672387&r1=672386&r2=672387&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/IQHandler.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/IQHandler.java Fri Jun 27 13:49:36 2008
@@ -41,6 +41,7 @@
return "iq";
}
+ @Override
protected boolean verifyType(Stanza stanza) {
return IQStanza.isOfType(stanza);
}
@@ -54,6 +55,7 @@
return firstInnerElement.getVerifier().namespacePresent(namespace);
}
+ @Override
@SpecCompliant(spec="3920", section="9.2.3#1,2,5,6", status=SpecCompliant.ComplianceStatus.FINISHED)
protected Stanza executeCore(XMPPCoreStanza coreStanza, SessionContext sessionContext) {
IQStanza stanza = (IQStanza)coreStanza;
Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/MessageHandler.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/MessageHandler.java?rev=672387&r1=672386&r2=672387&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/MessageHandler.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/MessageHandler.java Fri Jun 27 13:49:36 2008
@@ -35,11 +35,13 @@
return "message";
}
+ @Override
protected boolean verifyType(Stanza stanza) {
return MessageStanza.isOfType(stanza);
}
+ @Override
protected Stanza executeCore(XMPPCoreStanza stanza, SessionContext sessionContext) {
// (try to) read thread id
Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/bind/handler/BindIQHandler.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/bind/handler/BindIQHandler.java?rev=672387&r1=672386&r2=672387&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/bind/handler/BindIQHandler.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/bind/handler/BindIQHandler.java Fri Jun 27 13:49:36 2008
@@ -33,10 +33,12 @@
*/
public class BindIQHandler extends IQHandler {
+ @Override
protected boolean verifyNamespace(Stanza stanza) {
return verifyInnerNamespace(stanza, NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_BIND);
}
+ @Override
protected Stanza executeIQLogic(IQStanza stanza, SessionContext sessionContext) {
switch (stanza.getIQType()) {
Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/compatibility/jabber_iq_auth/handler/AuthCompatibilityIQHandler.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/compatibility/jabber_iq_auth/handler/AuthCompatibilityIQHandler.java?rev=672387&r1=672386&r2=672387&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/compatibility/jabber_iq_auth/handler/AuthCompatibilityIQHandler.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/compatibility/jabber_iq_auth/handler/AuthCompatibilityIQHandler.java Fri Jun 27 13:49:36 2008
@@ -31,10 +31,12 @@
*/
public class AuthCompatibilityIQHandler extends IQHandler {
+ @Override
protected boolean verifyNamespace(Stanza stanza) {
return verifyInnerNamespace(stanza, NamespaceURIs.JABBER_IQ_AUTH_COMPATIBILITY);
}
+ @Override
protected Stanza executeIQLogic(IQStanza stanza, SessionContext sessionContext) {
// from XEP 78 - http://www.xmpp.org/extensions/xep-0078.html:
Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceHandler.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceHandler.java?rev=672387&r1=672386&r2=672387&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceHandler.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceHandler.java Fri Jun 27 13:49:36 2008
@@ -37,11 +37,13 @@
return "presence";
}
- protected boolean verifyType(Stanza stanza) {
+ @Override
+ protected boolean verifyType(Stanza stanza) {
return PresenceStanza.isOfType(stanza);
}
- protected Stanza executeCore(XMPPCoreStanza stanza,
+ @Override
+ protected Stanza executeCore(XMPPCoreStanza stanza,
SessionContext sessionContext) {
PresenceStanza presenceStanza = (PresenceStanza)stanza;
Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AuthHandler.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AuthHandler.java?rev=672387&r1=672386&r2=672387&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AuthHandler.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AuthHandler.java Fri Jun 27 13:49:36 2008
@@ -17,6 +17,8 @@
package org.apache.vysper.xmpp.modules.core.sasl.handler;
+import org.apache.vysper.xmpp.authorization.SASLMechanism;
+import org.apache.vysper.xmpp.modules.core.sasl.SASLFailureType;
import org.apache.vysper.xmpp.protocol.NamespaceURIs;
import org.apache.vysper.xmpp.protocol.ResponseStanzaContainer;
import org.apache.vysper.xmpp.protocol.ResponseStanzaContainerImpl;
@@ -25,12 +27,9 @@
import org.apache.vysper.xmpp.server.SessionContext;
import org.apache.vysper.xmpp.server.SessionState;
import org.apache.vysper.xmpp.server.response.ServerErrorResponses;
-import org.apache.vysper.xmpp.server.response.ServerResponses;
import org.apache.vysper.xmpp.stanza.Stanza;
-import org.apache.vysper.xmpp.xmlfragment.XMLElementVerifier;
import org.apache.vysper.xmpp.xmlfragment.Attribute;
-import org.apache.vysper.xmpp.modules.core.sasl.SASLFailureType;
-import org.apache.vysper.xmpp.authorization.SASLMechanism;
+import org.apache.vysper.xmpp.xmlfragment.XMLElementVerifier;
import java.util.List;
Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/session/handler/SessionIQHandler.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/session/handler/SessionIQHandler.java?rev=672387&r1=672386&r2=672387&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/session/handler/SessionIQHandler.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/session/handler/SessionIQHandler.java Fri Jun 27 13:49:36 2008
@@ -30,10 +30,12 @@
*/
public class SessionIQHandler extends IQHandler {
+ @Override
protected boolean verifyNamespace(Stanza stanza) {
return verifyInnerNamespace(stanza, NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_SESSION);
}
+ @Override
protected Stanza executeIQLogic(IQStanza stanza, SessionContext sessionContext) {
switch (stanza.getIQType()) {
Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/roster/handler/RosterIQHandler.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/roster/handler/RosterIQHandler.java?rev=672387&r1=672386&r2=672387&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/roster/handler/RosterIQHandler.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/roster/handler/RosterIQHandler.java Fri Jun 27 13:49:36 2008
@@ -40,10 +40,12 @@
*/
public class RosterIQHandler extends IQHandler {
+ @Override
protected boolean verifyNamespace(Stanza stanza) {
return verifyInnerNamespace(stanza, NamespaceURIs.JABBER_IQ_ROSTER);
}
+ @Override
protected Stanza executeIQLogic(IQStanza stanza, SessionContext sessionContext) {
// TODO check the session for resource state
Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/parser/StringStreamParser.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/parser/StringStreamParser.java?rev=672387&r1=672386&r2=672387&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/parser/StringStreamParser.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/parser/StringStreamParser.java Fri Jun 27 13:49:36 2008
@@ -33,6 +33,7 @@
this.sourceSequence = sourceSequence;
}
+ @Override
protected XMLInputSource getInputSource() {
String xmlString = sourceSequence.toString();
if (!xmlString.startsWith("<?xml")) xmlString = DEFAULT_OPENING_XML_ELEMENT + xmlString;
Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/worker/AuthenticatedProtocolWorker.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/worker/AuthenticatedProtocolWorker.java?rev=672387&r1=672386&r2=672387&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/worker/AuthenticatedProtocolWorker.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/worker/AuthenticatedProtocolWorker.java Fri Jun 27 13:49:36 2008
@@ -29,6 +29,7 @@
*/
public class AuthenticatedProtocolWorker extends AbstractStateAwareProtocolWorker {
+ @Override
protected boolean checkState(SessionContext sessionContext, SessionStateHolder sessionStateHolder, Stanza stanza, StanzaHandler stanzaHandler, ResponseWriter responseWriter) {
if (stanzaHandler instanceof StreamStartHandler) return true;
if (stanzaHandler.verify(stanza)) return true;
@@ -36,6 +37,7 @@
return false;
}
+ @Override
public SessionState getHandledState() {
return SessionState.AUTHENTICATED;
}
Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/worker/EncryptedProtocolWorker.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/worker/EncryptedProtocolWorker.java?rev=672387&r1=672386&r2=672387&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/worker/EncryptedProtocolWorker.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/worker/EncryptedProtocolWorker.java Fri Jun 27 13:49:36 2008
@@ -30,10 +30,12 @@
*/
public class EncryptedProtocolWorker extends AbstractStateAwareProtocolWorker {
+ @Override
public SessionState getHandledState() {
return SessionState.ENCRYPTED;
}
+ @Override
protected boolean checkState(SessionContext sessionContext, SessionStateHolder sessionStateHolder, Stanza stanza, StanzaHandler stanzaHandler, ResponseWriter responseWriter) {
if (stanzaHandler instanceof StreamStartHandler) return true;
if (stanzaHandler instanceof AuthHandler) return true;
Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/worker/EncryptionStartedProtocolWorker.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/worker/EncryptionStartedProtocolWorker.java?rev=672387&r1=672386&r2=672387&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/worker/EncryptionStartedProtocolWorker.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/worker/EncryptionStartedProtocolWorker.java Fri Jun 27 13:49:36 2008
@@ -28,10 +28,12 @@
*/
public class EncryptionStartedProtocolWorker extends AbstractStateAwareProtocolWorker {
+ @Override
public SessionState getHandledState() {
return SessionState.ENCRYPTION_STARTED;
}
+ @Override
protected boolean checkState(SessionContext sessionContext, SessionStateHolder sessionStateHolder, Stanza stanza, StanzaHandler stanzaHandler, ResponseWriter responseWriter) {
// StartTLS is currently completely handled on the protocol side.
// anyway, there are no stanzas to be parsed between ENCRYPTION_STARTED and ENCRYPTED.
Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/worker/EndOrClosedProtocolWorker.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/worker/EndOrClosedProtocolWorker.java?rev=672387&r1=672386&r2=672387&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/worker/EndOrClosedProtocolWorker.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/worker/EndOrClosedProtocolWorker.java Fri Jun 27 13:49:36 2008
@@ -28,10 +28,12 @@
*/
public class EndOrClosedProtocolWorker extends AbstractStateAwareProtocolWorker {
+ @Override
public SessionState getHandledState() {
return SessionState.ENDED;
}
+ @Override
protected boolean checkState(SessionContext sessionContext, SessionStateHolder sessionStateHolder, Stanza stanza, StanzaHandler stanzaHandler, ResponseWriter responseWriter) {
throw new RuntimeException("session was terminated");
}
Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/worker/InitiatedProtocolWorker.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/worker/InitiatedProtocolWorker.java?rev=672387&r1=672386&r2=672387&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/worker/InitiatedProtocolWorker.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/worker/InitiatedProtocolWorker.java Fri Jun 27 13:49:36 2008
@@ -30,10 +30,12 @@
*/
public class InitiatedProtocolWorker extends AbstractStateAwareProtocolWorker {
+ @Override
public SessionState getHandledState() {
return SessionState.INITIATED;
}
+ @Override
protected boolean checkState(SessionContext sessionContext, SessionStateHolder sessionStateHolder, Stanza stanza, StanzaHandler stanzaHandler, ResponseWriter responseWriter) {
if (stanzaHandler instanceof XMLPrologHandler) return true;
if (stanzaHandler instanceof StreamStartHandler) return true;
Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/worker/StartedProtocolWorker.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/worker/StartedProtocolWorker.java?rev=672387&r1=672386&r2=672387&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/worker/StartedProtocolWorker.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/worker/StartedProtocolWorker.java Fri Jun 27 13:49:36 2008
@@ -29,10 +29,12 @@
*/
public class StartedProtocolWorker extends AbstractStateAwareProtocolWorker {
+ @Override
public SessionState getHandledState() {
return SessionState.STARTED;
}
+ @Override
protected boolean checkState(SessionContext sessionContext, SessionStateHolder sessionStateHolder, Stanza stanza, StanzaHandler stanzaHandler, ResponseWriter responseWriter) {
if (stanzaHandler instanceof StartTLSHandler) return true;
responseWriter.writeUnsupportedStanzaError(sessionContext);
Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/worker/UnconnectedProtocolWorker.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/worker/UnconnectedProtocolWorker.java?rev=672387&r1=672386&r2=672387&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/worker/UnconnectedProtocolWorker.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/worker/UnconnectedProtocolWorker.java Fri Jun 27 13:49:36 2008
@@ -28,10 +28,12 @@
*/
public class UnconnectedProtocolWorker extends AbstractStateAwareProtocolWorker {
+ @Override
public SessionState getHandledState() {
return SessionState.UNCONNECTED;
}
+ @Override
protected boolean checkState(SessionContext sessionContext, SessionStateHolder sessionStateHolder, Stanza stanza, StanzaHandler stanzaHandler, ResponseWriter responseWriter) {
// TODO
return true;
Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/security/BogusTrustManagerFactory.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/security/BogusTrustManagerFactory.java?rev=672387&r1=672386&r2=672387&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/security/BogusTrustManagerFactory.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/security/BogusTrustManagerFactory.java Fri Jun 27 13:49:36 2008
@@ -59,14 +59,17 @@
public BogusTrustManagerFactory() {
}
+ @Override
protected TrustManager[] engineGetTrustManagers() {
return X509_MANAGERS;
}
+ @Override
protected void engineInit(KeyStore keystore) throws KeyStoreException {
// noop
}
+ @Override
protected void engineInit(ManagerFactoryParameters managerFactoryParameters)
throws InvalidAlgorithmParameterException {
// noop
Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/security/FileBasedTLSContextFactory.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/security/FileBasedTLSContextFactory.java?rev=672387&r1=672386&r2=672387&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/security/FileBasedTLSContextFactory.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/security/FileBasedTLSContextFactory.java Fri Jun 27 13:49:36 2008
@@ -30,6 +30,7 @@
this.file = file;
}
+ @Override
protected InputStream getCertificateInputStream() throws IOException {
return new FileInputStream(file);
}
Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/stanza/IQStanza.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/stanza/IQStanza.java?rev=672387&r1=672386&r2=672387&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/stanza/IQStanza.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/stanza/IQStanza.java Fri Jun 27 13:49:36 2008
@@ -33,6 +33,7 @@
if (!isOfType(stanza)) throw new IllegalArgumentException("only IQ stanza is allowed here");
}
+ @Override
public String getName() {
return NAME;
}
Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/stanza/PresenceStanza.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/stanza/PresenceStanza.java?rev=672387&r1=672386&r2=672387&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/stanza/PresenceStanza.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/stanza/PresenceStanza.java Fri Jun 27 13:49:36 2008
@@ -37,6 +37,7 @@
if (!PresenceStanza.isOfType(stanza)) throw new IllegalArgumentException("only 'presence' stanza is allowed here");
}
+ @Override
public String getName() {
return NAME;
}
Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/stanza/XMPPCoreStanza.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/stanza/XMPPCoreStanza.java?rev=672387&r1=672386&r2=672387&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/stanza/XMPPCoreStanza.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/stanza/XMPPCoreStanza.java Fri Jun 27 13:49:36 2008
@@ -17,9 +17,6 @@
package org.apache.vysper.xmpp.stanza;
-import org.apache.vysper.xmpp.addressing.Entity;
-import org.apache.vysper.xmpp.addressing.EntityFormatException;
-import org.apache.vysper.xmpp.addressing.EntityImpl;
import org.apache.vysper.xmpp.protocol.NamespaceURIs;
import org.apache.vysper.xmpp.xmlfragment.XMLElementVerifier;
@@ -45,6 +42,7 @@
super(stanza.getName(), stanza.getNamespace(), stanza.getAttributes(), stanza.getInnerFragments());
}
+ @Override
public XMLElementVerifier getVerifier() {
if (xmlElementVerifier == null) xmlElementVerifier = new XMPPCoreStanzaVerifier(this);
return xmlElementVerifier;
@@ -54,6 +52,7 @@
return (XMPPCoreStanzaVerifier) getVerifier();
}
+ @Override
abstract public String getName();
public String getType() {
Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/xmlfragment/XMLElement.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/xmlfragment/XMLElement.java?rev=672387&r1=672386&r2=672387&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/xmlfragment/XMLElement.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/xmlfragment/XMLElement.java Fri Jun 27 13:49:36 2008
@@ -179,6 +179,7 @@
return langMap;
}
+ @Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || !(o instanceof XMLElement)) return false;
@@ -195,6 +196,7 @@
return true;
}
+ @Override
public int hashCode() {
int result;
result = (name != null ? name.hashCode() : 0);
Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/xmlfragment/XMLText.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/xmlfragment/XMLText.java?rev=672387&r1=672386&r2=672387&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/xmlfragment/XMLText.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/xmlfragment/XMLText.java Fri Jun 27 13:49:36 2008
@@ -31,6 +31,7 @@
return text;
}
+ @Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
@@ -42,10 +43,12 @@
return true;
}
+ @Override
public int hashCode() {
return (text != null ? text.hashCode() : 0);
}
+ @Override
public String toString() {
return getText();
}
Modified: labs/vysper/src/test/java/org/apache/vysper/mina/codec/MockIoSession.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/test/java/org/apache/vysper/mina/codec/MockIoSession.java?rev=672387&r1=672386&r2=672387&view=diff
==============================================================================
--- labs/vysper/src/test/java/org/apache/vysper/mina/codec/MockIoSession.java (original)
+++ labs/vysper/src/test/java/org/apache/vysper/mina/codec/MockIoSession.java Fri Jun 27 13:49:36 2008
@@ -30,6 +30,7 @@
public class MockIoSession extends BaseIoSession
{
+ @Override
protected void updateTrafficMask()
{
}
@@ -89,26 +90,32 @@
return null;
}
+ @Override
public Object getAttribute(String s) {
return super.getAttribute(s);
}
+ @Override
public Object setAttribute(String s, Object o) {
return super.setAttribute(s, o);
}
+ @Override
public Object setAttribute(String s) {
return super.setAttribute(s);
}
+ @Override
public Object removeAttribute(String s) {
return super.removeAttribute(s);
}
+ @Override
public boolean containsAttribute(String s) {
return super.containsAttribute(s);
}
+ @Override
public Set<String> getAttributeKeys() {
return super.getAttributeKeys();
}
Modified: labs/vysper/src/test/java/org/apache/vysper/stanzasession/StanzaSessionTestCase.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/test/java/org/apache/vysper/stanzasession/StanzaSessionTestCase.java?rev=672387&r1=672386&r2=672387&view=diff
==============================================================================
--- labs/vysper/src/test/java/org/apache/vysper/stanzasession/StanzaSessionTestCase.java (original)
+++ labs/vysper/src/test/java/org/apache/vysper/stanzasession/StanzaSessionTestCase.java Fri Jun 27 13:49:36 2008
@@ -36,6 +36,7 @@
private StanzaSessionFactory sessionFactory;
+ @Override
protected void setUp() throws Exception {
StanzaRelayBroker relay = new StanzaRelayBroker();
Modified: labs/vysper/src/test/java/org/apache/vysper/xmpp/modules/core/base/handler/IQHandlerTestCase.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/test/java/org/apache/vysper/xmpp/modules/core/base/handler/IQHandlerTestCase.java?rev=672387&r1=672386&r2=672387&view=diff
==============================================================================
--- labs/vysper/src/test/java/org/apache/vysper/xmpp/modules/core/base/handler/IQHandlerTestCase.java (original)
+++ labs/vysper/src/test/java/org/apache/vysper/xmpp/modules/core/base/handler/IQHandlerTestCase.java Fri Jun 27 13:49:36 2008
@@ -36,6 +36,7 @@
private SessionStateHolder sessionStateHolder = new SessionStateHolder();
+ @Override
protected void setUp() throws Exception {
super.setUp();
sessionContext = new TestSessionContext(sessionStateHolder);
Modified: labs/vysper/src/test/java/org/apache/vysper/xmpp/modules/core/base/handler/MessageHandlerRelayTestCase.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/test/java/org/apache/vysper/xmpp/modules/core/base/handler/MessageHandlerRelayTestCase.java?rev=672387&r1=672386&r2=672387&view=diff
==============================================================================
--- labs/vysper/src/test/java/org/apache/vysper/xmpp/modules/core/base/handler/MessageHandlerRelayTestCase.java (original)
+++ labs/vysper/src/test/java/org/apache/vysper/xmpp/modules/core/base/handler/MessageHandlerRelayTestCase.java Fri Jun 27 13:49:36 2008
@@ -39,6 +39,7 @@
private SessionStateHolder sessionStateHolder = new SessionStateHolder();
private MessageHandler messageHandler = new MessageHandler();
+ @Override
protected void setUp() throws Exception {
super.setUp();
sessionContext = TestSessionContext.createWithStanzaReceiverRelay(sessionStateHolder);
Modified: labs/vysper/src/test/java/org/apache/vysper/xmpp/modules/core/base/handler/TestIQHandler.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/test/java/org/apache/vysper/xmpp/modules/core/base/handler/TestIQHandler.java?rev=672387&r1=672386&r2=672387&view=diff
==============================================================================
--- labs/vysper/src/test/java/org/apache/vysper/xmpp/modules/core/base/handler/TestIQHandler.java (original)
+++ labs/vysper/src/test/java/org/apache/vysper/xmpp/modules/core/base/handler/TestIQHandler.java Fri Jun 27 13:49:36 2008
@@ -39,12 +39,14 @@
this.namespaceURI = namespaceURI;
}
+ @Override
public boolean verify(Stanza stanza) {
if (!super.verify(stanza)) return false;
if (name == null) return true;
return stanza.getVerifier().onlySubelementEquals(name, namespaceURI);
}
+ @Override
protected Stanza executeIQLogic(IQStanza stanza, SessionContext sessionContext) {
incomingStanza = stanza;
Modified: labs/vysper/src/test/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceHandlerTestCase.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/test/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceHandlerTestCase.java?rev=672387&r1=672386&r2=672387&view=diff
==============================================================================
--- labs/vysper/src/test/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceHandlerTestCase.java (original)
+++ labs/vysper/src/test/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceHandlerTestCase.java Fri Jun 27 13:49:36 2008
@@ -43,6 +43,7 @@
private StanzaReceiverQueue initiatorsQueue;
private EntityImpl clientFullQualified = null;
+ @Override
protected void setUp() throws Exception {
super.setUp();
sessionContext = TestSessionContext.createWithStanzaReceiverRelayAuthenticated();
Modified: labs/vysper/src/test/java/org/apache/vysper/xmpp/modules/core/starttls/handler/StartTLSHandlerTestCase.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/test/java/org/apache/vysper/xmpp/modules/core/starttls/handler/StartTLSHandlerTestCase.java?rev=672387&r1=672386&r2=672387&view=diff
==============================================================================
--- labs/vysper/src/test/java/org/apache/vysper/xmpp/modules/core/starttls/handler/StartTLSHandlerTestCase.java (original)
+++ labs/vysper/src/test/java/org/apache/vysper/xmpp/modules/core/starttls/handler/StartTLSHandlerTestCase.java Fri Jun 27 13:49:36 2008
@@ -34,6 +34,7 @@
private SessionStateHolder sessionStateHolder = new SessionStateHolder();
+ @Override
protected void setUp() throws Exception {
super.setUp();
sessionContext = new TestSessionContext(sessionStateHolder);
Modified: labs/vysper/src/test/java/org/apache/vysper/xmpp/modules/roster/handler/RosterIQHandlerTestCase.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/test/java/org/apache/vysper/xmpp/modules/roster/handler/RosterIQHandlerTestCase.java?rev=672387&r1=672386&r2=672387&view=diff
==============================================================================
--- labs/vysper/src/test/java/org/apache/vysper/xmpp/modules/roster/handler/RosterIQHandlerTestCase.java (original)
+++ labs/vysper/src/test/java/org/apache/vysper/xmpp/modules/roster/handler/RosterIQHandlerTestCase.java Fri Jun 27 13:49:36 2008
@@ -20,6 +20,7 @@
protected EntityImpl client;
protected RosterIQHandler handler;
+ @Override
protected void setUp() throws Exception {
super.setUp();
sessionContext = TestSessionContext.createWithStanzaReceiverRelayAuthenticated();
Modified: labs/vysper/src/test/java/org/apache/vysper/xmpp/parser/StringStreamParserTestCase.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/test/java/org/apache/vysper/xmpp/parser/StringStreamParserTestCase.java?rev=672387&r1=672386&r2=672387&view=diff
==============================================================================
--- labs/vysper/src/test/java/org/apache/vysper/xmpp/parser/StringStreamParserTestCase.java (original)
+++ labs/vysper/src/test/java/org/apache/vysper/xmpp/parser/StringStreamParserTestCase.java Fri Jun 27 13:49:36 2008
@@ -21,11 +21,13 @@
public class StringStreamParserTestCase extends AbstractStreamParserTestCase {
+ @Override
protected Stanza getFirstStanzaFromXML(String xml) throws ParsingException {
StreamParser streamParser = createStreamParser(xml);
return streamParser.getNextStanza();
}
+ @Override
protected StreamParser createStreamParser(String xml) {
return new StringStreamParser(xml);
}
Modified: labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/CallTestStanzaHandlerResponse.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/CallTestStanzaHandlerResponse.java?rev=672387&r1=672386&r2=672387&view=diff
==============================================================================
--- labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/CallTestStanzaHandlerResponse.java (original)
+++ labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/CallTestStanzaHandlerResponse.java Fri Jun 27 13:49:36 2008
@@ -29,6 +29,7 @@
super(name);
}
+ @Override
public ResponseStanzaContainer execute(Stanza stanza, SessionContext sessionContext, SessionStateHolder sessionStateHolder) throws ProtocolException {
super.execute(stanza, sessionContext, null);
return new ResponseStanzaContainerImpl(getResponseStanza());
Modified: labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolEncryptedTestCase.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolEncryptedTestCase.java?rev=672387&r1=672386&r2=672387&view=diff
==============================================================================
--- labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolEncryptedTestCase.java (original)
+++ labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolEncryptedTestCase.java Fri Jun 27 13:49:36 2008
@@ -24,6 +24,7 @@
*/
public class ProtocolEncryptedTestCase extends ProtocolStateTestCase {
+ @Override
protected SessionState getDefaultState() {
return SessionState.ENCRYPTED;
}
Modified: labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolEncryptionStartedTestCase.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolEncryptionStartedTestCase.java?rev=672387&r1=672386&r2=672387&view=diff
==============================================================================
--- labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolEncryptionStartedTestCase.java (original)
+++ labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolEncryptionStartedTestCase.java Fri Jun 27 13:49:36 2008
@@ -24,6 +24,7 @@
*/
public class ProtocolEncryptionStartedTestCase extends ProtocolStateTestCase {
+ @Override
protected SessionState getDefaultState() {
return SessionState.ENCRYPTION_STARTED;
}
Modified: labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolInitiatedTestCase.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolInitiatedTestCase.java?rev=672387&r1=672386&r2=672387&view=diff
==============================================================================
--- labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolInitiatedTestCase.java (original)
+++ labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolInitiatedTestCase.java Fri Jun 27 13:49:36 2008
@@ -51,6 +51,7 @@
checkLanguage("fr");
}
+ @Override
protected SessionState getDefaultState() {
return SessionState.INITIATED;
}
@@ -121,6 +122,7 @@
versionString = version;
}
+ @Override
public String toString() {
return versionString;
}
Modified: labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolStartedTestCase.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolStartedTestCase.java?rev=672387&r1=672386&r2=672387&view=diff
==============================================================================
--- labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolStartedTestCase.java (original)
+++ labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolStartedTestCase.java Fri Jun 27 13:49:36 2008
@@ -24,6 +24,7 @@
*/
public class ProtocolStartedTestCase extends ProtocolStateTestCase {
+ @Override
protected SessionState getDefaultState() {
return SessionState.STARTED;
}
Modified: labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolStateTestCase.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolStateTestCase.java?rev=672387&r1=672386&r2=672387&view=diff
==============================================================================
--- labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolStateTestCase.java (original)
+++ labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolStateTestCase.java Fri Jun 27 13:49:36 2008
@@ -40,6 +40,7 @@
protected EntityImpl testFrom = new EntityImpl("testuser", "vysper.org", null);
protected SessionStateHolder sessionStateHolder;
+ @Override
protected void setUp() throws Exception {
super.setUp();
Modified: labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerAquireTestCase.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerAquireTestCase.java?rev=672387&r1=672386&r2=672387&view=diff
==============================================================================
--- labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerAquireTestCase.java (original)
+++ labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerAquireTestCase.java Fri Jun 27 13:49:36 2008
@@ -35,6 +35,7 @@
private TestSessionContext sessionContext;
private SessionStateHolder sessionStateHolder;
+ @Override
protected void setUp() throws Exception {
super.setUp();
Modified: labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerProcessTestCase.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerProcessTestCase.java?rev=672387&r1=672386&r2=672387&view=diff
==============================================================================
--- labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerProcessTestCase.java (original)
+++ labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerProcessTestCase.java Fri Jun 27 13:49:36 2008
@@ -46,6 +46,7 @@
private static Entity serverEnitity = new EntityImpl(null, "test", null);
private SessionStateHolder sessionStateHolder;
+ @Override
protected void setUp() throws Exception {
super.setUp();
Modified: labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerStateAwarenessTestCase.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerStateAwarenessTestCase.java?rev=672387&r1=672386&r2=672387&view=diff
==============================================================================
--- labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerStateAwarenessTestCase.java (original)
+++ labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerStateAwarenessTestCase.java Fri Jun 27 13:49:36 2008
@@ -38,6 +38,7 @@
private TestSessionContext sessionContext;
private SessionStateHolder sessionStateHolder;
+ @Override
protected void setUp() throws Exception {
super.setUp();
Modified: labs/vysper/src/test/java/org/apache/vysper/xmpp/server/TestSessionContext.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/test/java/org/apache/vysper/xmpp/server/TestSessionContext.java?rev=672387&r1=672386&r2=672387&view=diff
==============================================================================
--- labs/vysper/src/test/java/org/apache/vysper/xmpp/server/TestSessionContext.java (original)
+++ labs/vysper/src/test/java/org/apache/vysper/xmpp/server/TestSessionContext.java Fri Jun 27 13:49:36 2008
@@ -21,7 +21,6 @@
import org.apache.vysper.xmpp.addressing.EntityImpl;
import org.apache.vysper.xmpp.delivery.RecordingStanzaRelay;
import org.apache.vysper.xmpp.delivery.StanzaReceiverRelay;
-import org.apache.vysper.xmpp.delivery.StanzaReceiver;
import org.apache.vysper.xmpp.delivery.StanzaReceiverQueue;
import org.apache.vysper.xmpp.protocol.SessionStateHolder;
import org.apache.vysper.xmpp.stanza.Stanza;
Modified: labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragementConverterConvertErrorTestCase.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragementConverterConvertErrorTestCase.java?rev=672387&r1=672386&r2=672387&view=diff
==============================================================================
--- labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragementConverterConvertErrorTestCase.java (original)
+++ labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragementConverterConvertErrorTestCase.java Fri Jun 27 13:49:36 2008
@@ -26,6 +26,7 @@
public class XMLRawToFragementConverterConvertErrorTestCase extends TestCase {
private XMLRawToFragementConverter xmlRawToFragementConverter;
+ @Override
protected void setUp() throws Exception {
super.setUp();
xmlRawToFragementConverter = new XMLRawToFragementConverter();
Modified: labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragementConverterConvertTestCase.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragementConverterConvertTestCase.java?rev=672387&r1=672386&r2=672387&view=diff
==============================================================================
--- labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragementConverterConvertTestCase.java (original)
+++ labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragementConverterConvertTestCase.java Fri Jun 27 13:49:36 2008
@@ -18,7 +18,6 @@
import junit.framework.TestCase;
import org.apache.vysper.xmpp.xmlfragment.XMLElement;
-import org.apache.vysper.xmpp.xmlfragment.XMLFragment;
import org.apache.vysper.xmpp.xmlfragment.Attribute;
import java.util.ArrayList;
@@ -29,6 +28,7 @@
public class XMLRawToFragementConverterConvertTestCase extends TestCase {
private XMLRawToFragementConverter xmlRawToFragementConverter;
+ @Override
protected void setUp() throws Exception {
super.setUp();
xmlRawToFragementConverter = new XMLRawToFragementConverter();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org