Hmm, given we're now both making changes to core merging in the s2s branch will be a mess. Rethinking this, how about we go the way you suggested with both working on trunk? Are you comfortable with the changes I'm making in core to go on trunk directly?
/niklas On Tue, Dec 28, 2010 at 12:50 PM, <[email protected]> wrote: > Author: berndf > Date: Tue Dec 28 11:50:49 2010 > New Revision: 1053313 > > URL: http://svn.apache.org/viewvc?rev=1053313&view=rev > Log: > make use of commons-lang for checking strings. > > Modified: > mina/vysper/trunk/server/core/pom.xml > > mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0049_privatedata/PrivateDataModule.java > > mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0054_vcardtemp/VcardTempModule.java > > mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0092_software_version/SoftwareVersionModule.java > > mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0119_xmppping/XmppPingModule.java > > mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0202_entity_time/EntityTimeModule.java > > mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/roster/RosterUtils.java > > mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/Feature.java > > mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/Identity.java > > mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/XMPPVersion.java > > mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/state/resourcebinding/ResourceRegistry.java > > Modified: mina/vysper/trunk/server/core/pom.xml > URL: > http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/pom.xml?rev=1053313&r1=1053312&r2=1053313&view=diff > ============================================================================== > --- mina/vysper/trunk/server/core/pom.xml (original) > +++ mina/vysper/trunk/server/core/pom.xml Tue Dec 28 11:50:49 2010 > @@ -89,6 +89,13 @@ > <groupId>commons-codec</groupId> > <artifactId>commons-codec</artifactId> > </dependency> > + > + <dependency> > + <groupId>commons-lang</groupId> > + <artifactId>commons-lang</artifactId> > + <version>2.5</version> > + </dependency> > + > > <!-- Logging --> > <dependency> > > Modified: > mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0049_privatedata/PrivateDataModule.java > URL: > http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0049_privatedata/PrivateDataModule.java?rev=1053313&r1=1053312&r2=1053313&view=diff > ============================================================================== > --- > mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0049_privatedata/PrivateDataModule.java > (original) > +++ > mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0049_privatedata/PrivateDataModule.java > Tue Dec 28 11:50:49 2010 > @@ -22,6 +22,7 @@ package org.apache.vysper.xmpp.modules.e > import java.util.ArrayList; > import java.util.List; > > +import org.apache.commons.lang.StringUtils; > import org.apache.vysper.xmpp.modules.DefaultDiscoAwareModule; > import org.apache.vysper.xmpp.modules.servicediscovery.management.Feature; > import > org.apache.vysper.xmpp.modules.servicediscovery.management.InfoElement; > @@ -75,7 +76,7 @@ public class PrivateDataModule extends D > } > > public List<InfoElement> getServerInfosFor(InfoRequest request) { > - if (request.getNode() != null && request.getNode().length() > 0) > return null; > + if (StringUtils.isNotEmpty(request.getNode())) return null; > > List<InfoElement> infoElements = new ArrayList<InfoElement>(); > infoElements.add(new Feature(NamespaceURIs.PRIVATE_DATA)); > > Modified: > mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0054_vcardtemp/VcardTempModule.java > URL: > http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0054_vcardtemp/VcardTempModule.java?rev=1053313&r1=1053312&r2=1053313&view=diff > ============================================================================== > --- > mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0054_vcardtemp/VcardTempModule.java > (original) > +++ > mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0054_vcardtemp/VcardTempModule.java > Tue Dec 28 11:50:49 2010 > @@ -22,6 +22,7 @@ package org.apache.vysper.xmpp.modules.e > import java.util.ArrayList; > import java.util.List; > > +import org.apache.commons.lang.StringUtils; > import org.apache.vysper.xmpp.modules.DefaultDiscoAwareModule; > import org.apache.vysper.xmpp.modules.servicediscovery.management.Feature; > import > org.apache.vysper.xmpp.modules.servicediscovery.management.InfoElement; > @@ -75,7 +76,7 @@ public class VcardTempModule extends Def > } > > public List<InfoElement> getServerInfosFor(InfoRequest request) { > - if (request.getNode() != null && request.getNode().length() > 0) > return null; > + if (StringUtils.isNotEmpty(request.getNode())) return null; > > List<InfoElement> infoElements = new ArrayList<InfoElement>(); > infoElements.add(new Feature(NamespaceURIs.VCARD_TEMP)); > > Modified: > mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0092_software_version/SoftwareVersionModule.java > URL: > http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0092_software_version/SoftwareVersionModule.java?rev=1053313&r1=1053312&r2=1053313&view=diff > ============================================================================== > --- > mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0092_software_version/SoftwareVersionModule.java > (original) > +++ > mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0092_software_version/SoftwareVersionModule.java > Tue Dec 28 11:50:49 2010 > @@ -22,6 +22,7 @@ package org.apache.vysper.xmpp.modules.e > import java.util.ArrayList; > import java.util.List; > > +import org.apache.commons.lang.StringUtils; > import org.apache.vysper.xmpp.modules.DefaultDiscoAwareModule; > import org.apache.vysper.xmpp.modules.servicediscovery.management.Feature; > import > org.apache.vysper.xmpp.modules.servicediscovery.management.InfoElement; > @@ -53,7 +54,7 @@ public class SoftwareVersionModule exten > } > > public List<InfoElement> getServerInfosFor(InfoRequest request) { > - if (request.getNode() != null && request.getNode().length() > 0) > return null; > + if (StringUtils.isNotEmpty(request.getNode())) return null; > > List<InfoElement> infoElements = new ArrayList<InfoElement>(); > infoElements.add(new Feature(NamespaceURIs.JABBER_IQ_VERSION)); > > Modified: > mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0119_xmppping/XmppPingModule.java > URL: > http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0119_xmppping/XmppPingModule.java?rev=1053313&r1=1053312&r2=1053313&view=diff > ============================================================================== > --- > mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0119_xmppping/XmppPingModule.java > (original) > +++ > mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0119_xmppping/XmppPingModule.java > Tue Dec 28 11:50:49 2010 > @@ -22,6 +22,7 @@ package org.apache.vysper.xmpp.modules.e > import java.util.ArrayList; > import java.util.List; > > +import org.apache.commons.lang.StringUtils; > import org.apache.vysper.xmpp.modules.DefaultDiscoAwareModule; > import org.apache.vysper.xmpp.modules.servicediscovery.management.Feature; > import > org.apache.vysper.xmpp.modules.servicediscovery.management.InfoElement; > @@ -54,7 +55,7 @@ public class XmppPingModule extends Defa > } > > public List<InfoElement> getServerInfosFor(InfoRequest request) { > - if (request.getNode() != null && request.getNode().length() > 0) > return null; > + if (StringUtils.isNotEmpty(request.getNode())) return null; > > List<InfoElement> infoElements = new ArrayList<InfoElement>(); > infoElements.add(new Feature(NamespaceURIs.URN_XMPP_PING)); > > Modified: > mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0202_entity_time/EntityTimeModule.java > URL: > http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0202_entity_time/EntityTimeModule.java?rev=1053313&r1=1053312&r2=1053313&view=diff > ============================================================================== > --- > mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0202_entity_time/EntityTimeModule.java > (original) > +++ > mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0202_entity_time/EntityTimeModule.java > Tue Dec 28 11:50:49 2010 > @@ -22,6 +22,7 @@ package org.apache.vysper.xmpp.modules.e > import java.util.ArrayList; > import java.util.List; > > +import org.apache.commons.lang.StringUtils; > import org.apache.vysper.xmpp.modules.DefaultDiscoAwareModule; > import org.apache.vysper.xmpp.modules.servicediscovery.management.Feature; > import > org.apache.vysper.xmpp.modules.servicediscovery.management.InfoElement; > @@ -55,7 +56,7 @@ public class EntityTimeModule extends De > } > > public List<InfoElement> getServerInfosFor(InfoRequest request) { > - if (request.getNode() != null && request.getNode().length() > 0) > return null; > + if (StringUtils.isNotEmpty(request.getNode())) return null; > > List<InfoElement> infoElements = new ArrayList<InfoElement>(); > infoElements.add(new Feature(NamespaceURIs.URN_XMPP_TIME)); > > Modified: > mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/roster/RosterUtils.java > URL: > http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/roster/RosterUtils.java?rev=1053313&r1=1053312&r2=1053313&view=diff > ============================================================================== > --- > mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/roster/RosterUtils.java > (original) > +++ > mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/roster/RosterUtils.java > Tue Dec 28 11:50:49 2010 > @@ -28,6 +28,7 @@ import java.util.HashMap; > import java.util.List; > import java.util.Map; > > +import org.apache.commons.lang.StringUtils; > import org.apache.vysper.compliance.SpecCompliance; > import org.apache.vysper.compliance.SpecCompliant; > import org.apache.vysper.xml.fragment.Attribute; > @@ -156,7 +157,7 @@ public class RosterUtils { > } catch (XMLSemanticError xmlSemanticError) { > throw new RosterBadRequestException("roster item group > node is malformed"); > } > - if (groupName == null || groupName.length() == 0) { > + if (StringUtils.isEmpty(groupName)) { > throw new RosterNotAcceptableException("roster item group > name of zero length"); > } else if (groupName.length() > > RosterConfiguration.ROSTER_GROUP_NAME_MAX_LENGTH) { > throw new RosterNotAcceptableException("roster item group > name too long: " + groupName.length()); > > Modified: > mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/Feature.java > URL: > http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/Feature.java?rev=1053313&r1=1053312&r2=1053313&view=diff > ============================================================================== > --- > mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/Feature.java > (original) > +++ > mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/Feature.java > Tue Dec 28 11:50:49 2010 > @@ -19,6 +19,7 @@ > */ > package org.apache.vysper.xmpp.modules.servicediscovery.management; > > +import org.apache.commons.lang.StringUtils; > import org.apache.vysper.xmpp.protocol.NamespaceURIs; > import org.apache.vysper.xmpp.stanza.StanzaBuilder; > > @@ -33,7 +34,7 @@ public class Feature implements InfoElem > protected String var; > > public Feature(String var) { > - if (var == null || var.length() == 0) > + if (StringUtils.isEmpty(var)) > throw new IllegalArgumentException("var may not be null"); > this.var = var; > } > > Modified: > mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/Identity.java > URL: > http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/Identity.java?rev=1053313&r1=1053312&r2=1053313&view=diff > ============================================================================== > --- > mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/Identity.java > (original) > +++ > mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/Identity.java > Tue Dec 28 11:50:49 2010 > @@ -19,6 +19,7 @@ > */ > package org.apache.vysper.xmpp.modules.servicediscovery.management; > > +import org.apache.commons.lang.StringUtils; > import org.apache.vysper.xmpp.protocol.NamespaceURIs; > import org.apache.vysper.xmpp.stanza.StanzaBuilder; > > @@ -37,9 +38,9 @@ public class Identity implements InfoEle > protected String name; // optional > > public Identity(String category, String type, String name) { > - if (category == null || category.length() == 0) > + if (StringUtils.isEmpty(category)) > throw new IllegalArgumentException("category may not be null"); > - if (type == null || type.length() == 0) > + if (StringUtils.isEmpty(type)) > throw new IllegalArgumentException("type may not be null"); > this.category = category; > this.type = type; > > Modified: > mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/XMPPVersion.java > URL: > http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/XMPPVersion.java?rev=1053313&r1=1053312&r2=1053313&view=diff > ============================================================================== > --- > mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/XMPPVersion.java > (original) > +++ > mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/XMPPVersion.java > Tue Dec 28 11:50:49 2010 > @@ -20,6 +20,8 @@ > > package org.apache.vysper.xmpp.server; > > +import org.apache.commons.lang.StringUtils; > + > /** > * > * @author The Apache MINA Project ([email protected]) > @@ -65,7 +67,7 @@ public class XMPPVersion { > } > > private int convertToInt(String part) { > - if (part == null || part.length() == 0) > + if (StringUtils.isEmpty(part)) > throw new IllegalArgumentException("version part is empty"); > if (STRING_ZERO.equals(part)) > return 0; > > Modified: > mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/state/resourcebinding/ResourceRegistry.java > URL: > http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/state/resourcebinding/ResourceRegistry.java?rev=1053313&r1=1053312&r2=1053313&view=diff > ============================================================================== > --- > mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/state/resourcebinding/ResourceRegistry.java > (original) > +++ > mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/state/resourcebinding/ResourceRegistry.java > Tue Dec 28 11:50:49 2010 > @@ -312,6 +312,14 @@ public class ResourceRegistry { > } > > /** > + * number of active bare ids (# of users, regardless whether they have > one or more connected sessions) > + * @return > + */ > + public long getSessionCount() { > + return entityResources.size(); > + } > + > + /** > * retrieves the highest prioritized session(s) for this entity. > * > * @param entity if this is not a bare JID, only the session for the > JID's resource part will be returned, without > > >
