Author: ngn
Date: Wed Aug 19 19:39:16 2009
New Revision: 805947
URL: http://svn.apache.org/viewvc?rev=805947&view=rev
Log:
Implement room items disco (VYSPER-105)
Added:
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCRoomItemsDiscoTestCase.java
Modified:
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/Room.java
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractDiscoTestCase.java
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractInfoDiscoTestCase.java
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractItemsDiscoTestCase.java
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCItemsDiscoTestCase.java
Modified:
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/Room.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/Room.java?rev=805947&r1=805946&r2=805947&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/Room.java
(original)
+++
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/Room.java
Wed Aug 19 19:39:16 2009
@@ -30,6 +30,7 @@
import java.util.concurrent.ConcurrentHashMap;
import org.apache.vysper.xmpp.addressing.Entity;
+import org.apache.vysper.xmpp.addressing.EntityImpl;
import org.apache.vysper.xmpp.modules.servicediscovery.management.Feature;
import org.apache.vysper.xmpp.modules.servicediscovery.management.Identity;
import org.apache.vysper.xmpp.modules.servicediscovery.management.InfoElement;
@@ -165,8 +166,18 @@
public List<Item> getItemsFor(InfoRequest request)
throws ServiceDiscoveryRequestException {
- // TODO Auto-generated method stub
- return null;
+ // List of users
+ List<Item> items = new ArrayList<Item>();
+
+ // TODO is this the right way to determine if the room is private?
+ if(isRoomType(RoomType.FullyAnonymous) ||
isRoomType(RoomType.SemiAnonymous)) {
+ // private room, return empty list
+ } else {
+ for(Occupant occupant : getOccupants()) {
+ items.add(new Item(new EntityImpl(getJID(),
occupant.getName())));
+ }
+ }
+ return items;
}
public String getPassword() {
Modified:
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractDiscoTestCase.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractDiscoTestCase.java?rev=805947&r1=805946&r2=805947&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractDiscoTestCase.java
(original)
+++
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractDiscoTestCase.java
Wed Aug 19 19:39:16 2009
@@ -55,6 +55,8 @@
protected abstract IQHandler createDiscoIQHandler();
+ protected abstract Entity getTo();
+
public void testDisco() throws Exception {
ServiceCollector serviceCollector = new ServiceCollector();
addListener(serviceCollector);
Modified:
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractInfoDiscoTestCase.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractInfoDiscoTestCase.java?rev=805947&r1=805946&r2=805947&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractInfoDiscoTestCase.java
(original)
+++
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractInfoDiscoTestCase.java
Wed Aug 19 19:39:16 2009
@@ -56,8 +56,6 @@
}
- protected abstract Entity getTo();
-
/**
* Default, expect no identity
*/
Modified:
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractItemsDiscoTestCase.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractItemsDiscoTestCase.java?rev=805947&r1=805946&r2=805947&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractItemsDiscoTestCase.java
(original)
+++
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractItemsDiscoTestCase.java
Wed Aug 19 19:39:16 2009
@@ -71,7 +71,7 @@
@Override
protected StanzaBuilder buildRequest() {
- StanzaBuilder request = StanzaBuilder.createIQStanza(USER_JID,
SERVER_JID, IQStanzaType.GET, "1");
+ StanzaBuilder request = StanzaBuilder.createIQStanza(USER_JID,
getTo(), IQStanzaType.GET, "1");
request.startInnerElement("query",
NamespaceURIs.XEP0030_SERVICE_DISCOVERY_ITEMS).endInnerElement();
return request;
}
Modified:
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCItemsDiscoTestCase.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCItemsDiscoTestCase.java?rev=805947&r1=805946&r2=805947&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCItemsDiscoTestCase.java
(original)
+++
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCItemsDiscoTestCase.java
Wed Aug 19 19:39:16 2009
@@ -22,9 +22,9 @@
import java.util.Arrays;
import java.util.List;
+import org.apache.vysper.TestUtil;
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.modules.Module;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Conference;
import org.apache.vysper.xmpp.modules.servicediscovery.management.Item;
@@ -35,30 +35,27 @@
*/
public class MUCItemsDiscoTestCase extends AbstractItemsDiscoTestCase {
- private Entity jid1;
- private Entity jid2;
+ private static final Entity ROOM1_JID =
TestUtil.parseUnchecked("[email protected]");
+ private static final Entity ROME2_JID =
TestUtil.parseUnchecked("[email protected]");
@Override
- protected void setUp() throws Exception {
- super.setUp();
-
- jid1 = EntityImpl.parse("[email protected]");
- jid2 = EntityImpl.parse("[email protected]");
- }
-
- @Override
protected Module getModule() {
Conference conference = new Conference("Foo");
- conference.createRoom(jid1, "room1");
- conference.createRoom(jid2, "room2");
+ conference.createRoom(ROOM1_JID, "room1");
+ conference.createRoom(ROME2_JID, "room2");
return new MUCModule(MODULE_JID, conference);
}
@Override
protected List<Item> getExpectedItems() throws EntityFormatException {
return Arrays.asList(
- new Item(jid1, "room1"),
- new Item(jid2, "room2")
+ new Item(ROOM1_JID, "room1"),
+ new Item(ROME2_JID, "room2")
);
}
+
+ @Override
+ protected Entity getTo() {
+ return SERVER_JID;
+ }
}
Added:
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCRoomItemsDiscoTestCase.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCRoomItemsDiscoTestCase.java?rev=805947&view=auto
==============================================================================
---
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCRoomItemsDiscoTestCase.java
(added)
+++
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCRoomItemsDiscoTestCase.java
Wed Aug 19 19:39:16 2009
@@ -0,0 +1,70 @@
+/*
+ * 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.xep0045_muc;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.vysper.TestUtil;
+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.modules.Module;
+import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Conference;
+import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Room;
+import org.apache.vysper.xmpp.modules.servicediscovery.management.Item;
+
+/**
+ *
+ * @author The Apache MINA Project ([email protected])
+ */
+public class MUCRoomItemsDiscoTestCase extends AbstractItemsDiscoTestCase {
+
+ private static final Entity ROOM_JID =
TestUtil.parseUnchecked("[email protected]");
+
+ private static final Entity USER1_JID =
TestUtil.parseUnchecked("[email protected]");
+ private static final Entity USER2_JID =
TestUtil.parseUnchecked("[email protected]");
+
+ private static final Entity OCCUPANT1_JID = new EntityImpl(ROOM_JID, "Nick
1");
+ private static final Entity OCCUPANT2_JID = new EntityImpl(ROOM_JID, "Nick
2");
+
+
+ @Override
+ protected Module getModule() {
+ Conference conference = new Conference("Foo");
+ Room room = conference.createRoom(ROOM_JID, "room1");
+ room.addOccupant(USER1_JID, "Nick 1");
+ room.addOccupant(USER2_JID, "Nick 2");
+ return new MUCModule(MODULE_JID, conference);
+ }
+
+ @Override
+ protected List<Item> getExpectedItems() throws EntityFormatException {
+ return Arrays.asList(
+ new Item(OCCUPANT1_JID),
+ new Item(OCCUPANT2_JID)
+ );
+ }
+
+ @Override
+ protected Entity getTo() {
+ return ROOM_JID;
+ }
+}
