Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow node creation with default configuration (i.e. no <configure/>) #201

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow node creation with default configuration (i.e. no <configure/>) #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions src/main/java/org/buddycloud/channelserver/channel/node/configuration/Helper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.buddycloud.channelserver.channel.node.configuration;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map.Entry;
Expand Down Expand Up @@ -123,8 +124,18 @@ private List<FormField> getConfigurationValuesFromDisco(IQ request) {
}

private List<FormField> getConfigurationValues(IQ request) {
Element element = request.getElement().element("pubsub")
.element("configure").element("x");
Element configure = request.getElement().element("pubsub").element("configure");

if(configure == null) {
return Collections.emptyList();
}

Element element = configure.element("x");

if(element == null) {
return Collections.emptyList();
}

DataForm dataForm = new DataForm(element);
List<FormField> fields = dataForm.getFields();
return fields;
Expand Down
40 changes: 31 additions & 9 deletions src/test/java/org/buddycloud/channelserver/channel/node/configuration/HelperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,6 @@ public void setUp() {
parser.setFieldFactory(new Factory());
}

@Test(expected = NodeConfigurationException.class)
public void testPassingPacketWhichDoesntContainConfigureElementThrowsException() {
Element iq = new DOMElement("iq");
iq.addElement("pubsub", JabberPubsub.NS_PUBSUB_OWNER);
IQ request = new IQ(iq);

parser.parse(request);
}

@Test
public void testNotProvidingAnyConfigurationFieldsReturnsOnlyLastUpdatedDate()
throws NodeStoreException {
Expand Down Expand Up @@ -382,4 +373,35 @@ public void testRequiredFieldsGetSetIfNotPresentInExistingData() throws Exceptio
Assert.assertNotNull(configurationValues.get(LastUpdatedDate.FIELD_NAME));

}

/**
* We expect this to <b>not</b> throw a {@link NodeConfigurationException}
*
* @see https://github.com/buddycloud/buddycloud-server-java/issues/200
*/
@Test
public void testParseIQWithMissingForm() {
Element iq = new DOMElement("iq");
Element pubsub = iq.addElement("pubsub");
pubsub.addAttribute("xmlns", JabberPubsub.NS_PUBSUB_OWNER);
pubsub.addElement("configure");

IQ request = new IQ(iq);
parser.parse(request);
}

/**
* We expect this to <b>not</b> throw a {@link NodeConfigurationException}
*
* @see https://github.com/buddycloud/buddycloud-server-java/issues/200
*/
@Test
public void testParseIQWithMissingConfigure() {
Element iq = new DOMElement("iq");
Element pubsub = iq.addElement("pubsub");
pubsub.addAttribute("xmlns", JabberPubsub.NS_PUBSUB_OWNER);

IQ request = new IQ(iq);
parser.parse(request);
}
}