You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ra...@apache.org on 2019/09/07 18:06:24 UTC
[mina-vysper] branch master updated: Message archive management:
mark preferences feature as not implemented
This is an automated email from the ASF dual-hosted git repository.
ralaoui pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-vysper.git
The following commit(s) were added to refs/heads/master by this push:
new 2fd2eba Message archive management: mark preferences feature as not implemented
2fd2eba is described below
commit 2fd2ebad3237a242f542cc4744ffecc9d98a3d51
Author: Réda Housni Alaoui <re...@gmail.com>
AuthorDate: Sat Sep 7 20:06:10 2019 +0200
Message archive management: mark preferences feature as not implemented
---
.../modules/extension/xep0313_mam/MAMModule.java | 9 +++--
.../preferences/MAMPreferenceHandler.java | 40 ++++++++++++++++++++++
.../{MAMIQHandler.java => MAMQueryHandler.java} | 6 ++--
.../extension/xep0313_mam/UserArchiveTest.java | 12 +++++++
.../xep0313_mam/query/MAMIQHandlerTest.java | 4 +--
5 files changed, 63 insertions(+), 8 deletions(-)
diff --git a/server/extensions/xep0313-mam/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0313_mam/MAMModule.java b/server/extensions/xep0313-mam/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0313_mam/MAMModule.java
index c7f7eaf..0c75eb3 100644
--- a/server/extensions/xep0313-mam/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0313_mam/MAMModule.java
+++ b/server/extensions/xep0313-mam/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0313_mam/MAMModule.java
@@ -28,7 +28,8 @@ import java.util.List;
import org.apache.commons.lang.StringUtils;
import org.apache.vysper.xmpp.modules.DefaultDiscoAwareModule;
import org.apache.vysper.xmpp.modules.extension.xep0313_mam.interceptor.MAMStanzaHandlerInterceptor;
-import org.apache.vysper.xmpp.modules.extension.xep0313_mam.query.MAMIQHandler;
+import org.apache.vysper.xmpp.modules.extension.xep0313_mam.preferences.MAMPreferenceHandler;
+import org.apache.vysper.xmpp.modules.extension.xep0313_mam.query.MAMQueryHandler;
import org.apache.vysper.xmpp.modules.extension.xep0313_mam.spi.MessageArchives;
import org.apache.vysper.xmpp.modules.servicediscovery.management.Feature;
import org.apache.vysper.xmpp.modules.servicediscovery.management.InfoElement;
@@ -91,8 +92,10 @@ public class MAMModule extends DefaultDiscoAwareModule implements ServerInfoRequ
@Override
protected void addHandlerDictionaries(List<HandlerDictionary> dictionary) {
- dictionary.add(new NamespaceHandlerDictionary(NAMESPACE_V1, new MAMIQHandler(NAMESPACE_V1)));
- dictionary.add(new NamespaceHandlerDictionary(NAMESPACE_V2, new MAMIQHandler(NAMESPACE_V2)));
+ dictionary.add(new NamespaceHandlerDictionary(NAMESPACE_V1, new MAMQueryHandler(NAMESPACE_V1)));
+ dictionary.add(new NamespaceHandlerDictionary(NAMESPACE_V2, new MAMQueryHandler(NAMESPACE_V2)));
+ dictionary.add(new NamespaceHandlerDictionary(NAMESPACE_V1, new MAMPreferenceHandler(NAMESPACE_V1)));
+ dictionary.add(new NamespaceHandlerDictionary(NAMESPACE_V2, new MAMPreferenceHandler(NAMESPACE_V2)));
}
@Override
diff --git a/server/extensions/xep0313-mam/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0313_mam/preferences/MAMPreferenceHandler.java b/server/extensions/xep0313-mam/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0313_mam/preferences/MAMPreferenceHandler.java
new file mode 100644
index 0000000..d649d45
--- /dev/null
+++ b/server/extensions/xep0313-mam/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0313_mam/preferences/MAMPreferenceHandler.java
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.vysper.xmpp.modules.extension.xep0313_mam.preferences;
+
+import org.apache.vysper.xmpp.modules.core.base.handler.DefaultIQHandler;
+import org.apache.vysper.xmpp.stanza.Stanza;
+
+/**
+ * @author Réda Housni Alaoui
+ */
+public class MAMPreferenceHandler extends DefaultIQHandler {
+
+ private final String namespace;
+
+ public MAMPreferenceHandler(String namespace) {
+ this.namespace = namespace;
+ }
+
+ @Override
+ protected boolean verifyInnerElement(Stanza stanza) {
+ return verifyInnerElementWorker(stanza, "prefs") && verifyInnerNamespace(stanza, namespace);
+ }
+}
diff --git a/server/extensions/xep0313-mam/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0313_mam/query/MAMIQHandler.java b/server/extensions/xep0313-mam/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0313_mam/query/MAMQueryHandler.java
similarity index 95%
rename from server/extensions/xep0313-mam/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0313_mam/query/MAMIQHandler.java
rename to server/extensions/xep0313-mam/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0313_mam/query/MAMQueryHandler.java
index 630b4e0..f26d51e 100644
--- a/server/extensions/xep0313-mam/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0313_mam/query/MAMIQHandler.java
+++ b/server/extensions/xep0313-mam/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0313_mam/query/MAMQueryHandler.java
@@ -42,18 +42,18 @@ import org.apache.vysper.xmpp.stanza.StanzaErrorType;
/**
* @author Réda Housni Alaoui
*/
-public class MAMIQHandler extends DefaultIQHandler {
+public class MAMQueryHandler extends DefaultIQHandler {
private final String namespace;
private final List<QueryHandler> queryHandlers;
- public MAMIQHandler(String namespace) {
+ public MAMQueryHandler(String namespace) {
this(namespace, new PubsubNodeArchiveQueryHandler(), new MUCArchiveQueryHandler(),
new UserArchiveQueryHandler());
}
- public MAMIQHandler(String namespace, QueryHandler pubsubNodeArchiveQueryHandler,
+ public MAMQueryHandler(String namespace, QueryHandler pubsubNodeArchiveQueryHandler,
QueryHandler mucArchiveQueryHandler, QueryHandler userArchiveQueryHandler) {
this.namespace = requireNonNull(namespace);
List<QueryHandler> modifiableQueryHandlers = new ArrayList<>();
diff --git a/server/extensions/xep0313-mam/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0313_mam/UserArchiveTest.java b/server/extensions/xep0313-mam/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0313_mam/UserArchiveTest.java
index 0e5bf4d..fd9b2b6 100644
--- a/server/extensions/xep0313-mam/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0313_mam/UserArchiveTest.java
+++ b/server/extensions/xep0313-mam/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0313_mam/UserArchiveTest.java
@@ -218,6 +218,18 @@ public class UserArchiveTest extends IntegrationTest {
assertEquals("Hello carol", message.getBody());
}
+ @Test
+ public void checkGetPreferences() throws SmackException.NotLoggedInException, SmackException.NotConnectedException,
+ InterruptedException, SmackException.NoResponseException {
+ MamManager mamManager = MamManager.getInstanceFor(alice());
+ try {
+ mamManager.retrieveArchivingPreferences();
+ fail("Expected an feature not implemented error");
+ } catch (XMPPException.XMPPErrorException errorException) {
+ assertTrue(errorException.getMessage().contains("feature-not-implemented"));
+ }
+ }
+
private Message fetchUniqueArchivedMessage(AbstractXMPPConnection connection)
throws XMPPException.XMPPErrorException, InterruptedException, SmackException.NotConnectedException,
SmackException.NotLoggedInException, SmackException.NoResponseException {
diff --git a/server/extensions/xep0313-mam/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0313_mam/query/MAMIQHandlerTest.java b/server/extensions/xep0313-mam/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0313_mam/query/MAMIQHandlerTest.java
index d0f5592..905bdef 100644
--- a/server/extensions/xep0313-mam/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0313_mam/query/MAMIQHandlerTest.java
+++ b/server/extensions/xep0313-mam/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0313_mam/query/MAMIQHandlerTest.java
@@ -60,7 +60,7 @@ public class MAMIQHandlerTest {
private SessionContext sessionContext;
- private MAMIQHandler tested;
+ private MAMQueryHandler tested;
@Before
public void before() throws IOException, SAXException {
@@ -68,7 +68,7 @@ public class MAMIQHandlerTest {
mucArchiveQueryHandler = mock(MUCArchiveQueryHandler.class);
userArchiveQueryHandler = mock(UserArchiveQueryHandler.class);
- tested = new MAMIQHandler("urn:xmpp:mam:2", pubsubNodeArchiveQueryHandler, mucArchiveQueryHandler,
+ tested = new MAMQueryHandler("urn:xmpp:mam:2", pubsubNodeArchiveQueryHandler, mucArchiveQueryHandler,
userArchiveQueryHandler);
XMLElement queryIqElement = XMLParserUtil.parseRequiredDocument(