Build #917

Plan branch:

Build: #917 was successful Scheduled with changes by Guus der Kinderen

Code commits

Openfire (master)

  • Guus der Kinderen

    Guus der Kinderen 625cf588a3988b8014e833bdc3041336dbd421ec

    Adjust CI connectivity test
    Remove unneeded pause from the test, increase the number of iterations.

    • runConnectivityIntegrationTests (version 625cf588a3988b8014e833bdc3041336dbd421ec)
  • Guus der Kinderen

    Guus der Kinderen 5cd51c16ba9941c9121e3ea3d43edafb396515e6

    OF-2156: Account for async processing of BOSH requests
    This is a major refactoring of the BOSH implementation, that primarily aims to address an issue where Openfire does not properly handle BOSH requests that are processed out-of-order (of their request ID / RID) values. These ordering issues can be expected to happen, due to the nature of the mechanism used (HTTP request), as well as because of the asynchronous Jetty API that's used.

    Additional improvements have been included (replacing a JiveGlobal with a SystemProperty, improving documentation, fixing most warnings generated by Intellij).

    • i18n/src/main/resources/openfire_i18n.properties (version 5cd51c16ba9941c9121e3ea3d43edafb396515e6)
    • xmppserver/src/main/java/org/jivesoftware/openfire/http/HttpBindManager.java (version 5cd51c16ba9941c9121e3ea3d43edafb396515e6)
    • xmppserver/src/main/java/org/jivesoftware/openfire/http/HttpBindServlet.java (version 5cd51c16ba9941c9121e3ea3d43edafb396515e6)
    • xmppserver/src/main/java/org/jivesoftware/openfire/http/HttpConnection.java (version 5cd51c16ba9941c9121e3ea3d43edafb396515e6)
    • xmppserver/src/main/java/org/jivesoftware/openfire/http/HttpSession.java (version 5cd51c16ba9941c9121e3ea3d43edafb396515e6)
    • xmppserver/src/main/java/org/jivesoftware/openfire/http/HttpSessionManager.java (version 5cd51c16ba9941c9121e3ea3d43edafb396515e6)
  • Guus der Kinderen

    Guus der Kinderen 240e29dac8252d466798ce680e32ab110b6db148

    OF-2161: Ensure that SSID for MUC PMs is the MUC JID
    When a private message that's exchanged in a MUC room is processed, it receives a stable and unique stanza ID. As per specification, Openfire adds a 'by' attribute. However, for private messages, this value is a full JID (representing the nickname of the user that sent the message), instead of a bare JID (representing the room in which the message was exchanged). This is fixed by ensuring that the JID used is a bare JID.

    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCUser.java (version 240e29dac8252d466798ce680e32ab110b6db148)
  • Guus der Kinderen

    Guus der Kinderen 2b09f3fa829a2afc23979b47f46446578d147c03

    Javadoc fix

    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCUser.java (version 2b09f3fa829a2afc23979b47f46446578d147c03)
  • Guus der Kinderen

    Guus der Kinderen 3ed2043e747cbe65c8ec31c79beac8a05556c8f5

    Fix javadoc, indentation

    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCUser.java (version 3ed2043e747cbe65c8ec31c79beac8a05556c8f5)
  • Guus der Kinderen

    Guus der Kinderen ae16f1db9c27ec8809165ce363863a069112700a

    OF-2162: Add 'ofrom' to private MUC messages
    This applies the changes applied to public MUC messages, introduced in OF-2089, and applies them to private messages too.

    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCRoom.java (version ae16f1db9c27ec8809165ce363863a069112700a)
  • Guus der Kinderen

    Guus der Kinderen bb3545762f322c98450cb93cc9e4cd242b7ba69f

    OF-2077: Do not execute cancels subscription on cluster node that does not have the pubsub node loaded in-memory.

    • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/CancelSubscriptionTask.java (version bb3545762f322c98450cb93cc9e4cd242b7ba69f)
    • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/SubscriptionTask.java (version bb3545762f322c98450cb93cc9e4cd242b7ba69f)
  • Guus der Kinderen

    Guus der Kinderen af14daf88643ce9cfa13d362cf4b028f8ea85521

    OF-2077: Do not execute remove pubsub node on cluster node that does not have the pubsub node loaded in-memory.

    • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/RemoveNodeTask.java (version af14daf88643ce9cfa13d362cf4b028f8ea85521)
  • Guus der Kinderen

    Guus der Kinderen 6d451d50fe99185625da11a02f27250feebe3936

    Improve contract of Pubsub cluster tasks
    This commit primarily adds javadoc comments. It also adds @Nonnull and @Nullable annotations, and replaces a method that has a typo in its name, leaving the old implementation marked as 'deprecated').

    Finally, it marks NodeChangeTask, which currently goes unused, as @Deprecated

    No functional changes are intended in this commit.

    • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/NodeSubscription.java (version 6d451d50fe99185625da11a02f27250feebe3936)
    • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PubSubEngine.java (version 6d451d50fe99185625da11a02f27250feebe3936)
    • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/AffiliationTask.java (version 6d451d50fe99185625da11a02f27250feebe3936)
    • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/CancelSubscriptionTask.java (version 6d451d50fe99185625da11a02f27250feebe3936)
    • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/FlushTask.java (version 6d451d50fe99185625da11a02f27250feebe3936)
    • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/ModifySubscriptionTask.java (version 6d451d50fe99185625da11a02f27250feebe3936)
    • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/NewSubscriptionTask.java (version 6d451d50fe99185625da11a02f27250feebe3936)
    • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/NodeChangeTask.java (version 6d451d50fe99185625da11a02f27250feebe3936)
    • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/NodeTask.java (version 6d451d50fe99185625da11a02f27250feebe3936)
    • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/RefreshNodeTask.java (version 6d451d50fe99185625da11a02f27250feebe3936)
    • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/RemoveNodeTask.java (version 6d451d50fe99185625da11a02f27250feebe3936)
    • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/SubscriptionTask.java (version 6d451d50fe99185625da11a02f27250feebe3936)
  • Guus der Kinderen

    Guus der Kinderen 44d2d36397d2b79e8ee70c7f553fa7766c9a74eb

    OF-2077: Do not execute affiliate change on cluster node that does not have the pubsub node loaded in-memory.

    • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/AffiliationTask.java (version 44d2d36397d2b79e8ee70c7f553fa7766c9a74eb)
  • Guus der Kinderen

    Guus der Kinderen b43e35b995fda66215b9053fcca8761d13d61acd

    OF-2077: Use Optional instead of null values

    • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/AffiliationTask.java (version b43e35b995fda66215b9053fcca8761d13d61acd)
    • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/CancelSubscriptionTask.java (version b43e35b995fda66215b9053fcca8761d13d61acd)
    • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/ModifySubscriptionTask.java (version b43e35b995fda66215b9053fcca8761d13d61acd)
    • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/NewSubscriptionTask.java (version b43e35b995fda66215b9053fcca8761d13d61acd)
    • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/NodeTask.java (version b43e35b995fda66215b9053fcca8761d13d61acd)
    • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/RefreshNodeTask.java (version b43e35b995fda66215b9053fcca8761d13d61acd)
    • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/RemoveNodeTask.java (version b43e35b995fda66215b9053fcca8761d13d61acd)
    • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/SubscriptionTask.java (version b43e35b995fda66215b9053fcca8761d13d61acd)
  • Guus der Kinderen

    Guus der Kinderen fcb52d71072caf2b6a89f60367387b66eeed8c98

    OF-2077: Rename methods to better express intent
    Methods that return data conditionally should be named appropriately, as to avoid confusion.

    • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/AffiliationTask.java (version fcb52d71072caf2b6a89f60367387b66eeed8c98)
    • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/CancelSubscriptionTask.java (version fcb52d71072caf2b6a89f60367387b66eeed8c98)
    • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/ModifySubscriptionTask.java (version fcb52d71072caf2b6a89f60367387b66eeed8c98)
    • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/NewSubscriptionTask.java (version fcb52d71072caf2b6a89f60367387b66eeed8c98)
    • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/NodeTask.java (version fcb52d71072caf2b6a89f60367387b66eeed8c98)
    • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/RefreshNodeTask.java (version fcb52d71072caf2b6a89f60367387b66eeed8c98)
    • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/RemoveNodeTask.java (version fcb52d71072caf2b6a89f60367387b66eeed8c98)
    • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/SubscriptionTask.java (version fcb52d71072caf2b6a89f60367387b66eeed8c98)
  • Guus der Kinderen

    Guus der Kinderen 01af09b1145fddc3b424c82e34351779f6d546c2

    OF-2077: Do not execute refresh pubsub node on cluster node that does not have the pubsub node loaded in-memory.

    • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/RefreshNodeTask.java (version 01af09b1145fddc3b424c82e34351779f6d546c2)
  • Guus der Kinderen

    Guus der Kinderen dc00462d73f0584f2856271d2d71a928c867b064

    Improve SubscriptionTask implementation
    The existing implementation lazily-loaded a subscription instance. Construction of such an instance is very cheap. Constructed instances are unlikely to be reused often by the SubscriptionTask that created them.

    To reduce complexity (and improve maintainability) of the code, the lazy-loading of the subscription instance is being removed.

    This should have not functional change. There is an API change that I deem neglible: a transient, package-protected field (that is not accessed outside of the class) is being removed.

    • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/SubscriptionTask.java (version dc00462d73f0584f2856271d2d71a928c867b064)
  • Guus der Kinderen

    Guus der Kinderen f9d718867582b83f33fa709615f280238fe03950

    OF-2077: Do not execute modify subscription on cluster node that does not have the pubsub node loaded in-memory.

    • xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/ModifySubscriptionTask.java (version f9d718867582b83f33fa709615f280238fe03950)