Merge pull request #493 from guusdk/OF-1028

OF-1028 Stream Management refactoring

src/java/org/jivesoftware/openfire/net/StanzaHandler.java

@@ -190,21 +190,8 @@ public abstract class StanzaHandler {
                 // resource binding and session establishment (to client sessions only)
                 waitingCompressionACK = true;
             }
-        } else if(isStreamManagementStanza(doc)) {
-        	switch(tag) {
-        		case "enable":
-        			session.enableStreamMangement(doc);
-        			break;
-        		case "r":
-        			session.getStreamManager().sendServerAcknowledgement();
-        			break;
-        		case "a":
-        			session.getStreamManager().processClientAcknowledgement(doc);
-        			break;
-        		default:
-        			process(doc);
-        			break;
-        	}
+        } else if (isStreamManagementStanza(doc)) {
+            session.getStreamManager().process( doc, session.getAddress() );
         }
         else {
             process(doc);

src/java/org/jivesoftware/openfire/session/LocalSession.java

@@ -453,28 +453,6 @@ public abstract class LocalSession implements Session {
         return "NONE";
     }
 
-    /**
-     * Enables stream management for session
-     * @param enable XEP-0198 <enable/> element
-     */
-    public void enableStreamMangement(Element enable) {
-
-    	// Do nothing if already enabled
-    	if(streamManager.isEnabled()) {
-    		return;
-    	}
-
-		streamManager.setNamespace(enable.getNamespace().getStringValue());
-
-    	// Ensure that resource binding has occurred
-    	if(getAddress().getResource() == null) {
-    		streamManager.sendUnexpectedError();
-    		return;
-    	}
-
-    	streamManager.setEnabled(true);
-	}
-
     @Override
     public final Locale getLanguage() {
         return language;

src/plugins/websocket/src/java/org/jivesoftware/openfire/websocket/StreamManagementPacketRouter.java

@@ -57,21 +57,8 @@ public class StreamManagementPacketRouter extends SessionPacketRouter {
 	@Override
 	public void route(Element wrappedElement) throws UnknownStanzaException {
 		
-        String tag = wrappedElement.getName();
 		if (StreamManager.NAMESPACE_V3.equals(wrappedElement.getNamespace().getStringValue())) {
-        	switch(tag) {
-	    		case "enable":
-	    			session.enableStreamMangement(wrappedElement);
-	    			break;
-        		case "r":
-        			session.getStreamManager().sendServerAcknowledgement();
-        			break;
-        		case "a":
-        			session.getStreamManager().processClientAcknowledgement(wrappedElement);
-        			break;
-        		default:
-	    			session.getStreamManager().sendUnexpectedError();
-        	}
+			session.getStreamManager().process( wrappedElement, session.getAddress() );
         } else {
         	super.route(wrappedElement);
 			if (isUnsolicitedAckExpected()) {