vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2025-09-10 01:29:38 +02:00
Code Issues Releases Wiki Activity

Merge pull request #253 from vanitasvitae/norEmpty

Browse source 
requireNotNullOrEmpty: Obey the rules of grammar
This commit is contained in:
Florian Schmaus 2018-07-28 12:57:49 +02:00 • committed by GitHub
commit 48627bd0fe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
32 changed files with 82 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

2
smack-experimental/src/main/java/org/jivesoftware/smackx/eme/element/ExplicitMessageEncryptionElement.java
View file

@ -87,7 +87,7 @@ public class ExplicitMessageEncryptionElement implements ExtensionElement {
}
public ExplicitMessageEncryptionElement(String encryptionNamespace, String name) {
this.encryptionNamespace = StringUtils.requireNotNullOrEmpty(encryptionNamespace,
this.encryptionNamespace = StringUtils.requireNotNullNorEmpty(encryptionNamespace,
"encryptionNamespace must not be null");
this.name = name;
}

4
smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/element/Tag.java
View file

@ -34,9 +34,9 @@ public class Tag implements NamedElement {
public Tag(String name, Type type, String value) {
// TODO According to XEP-0347 § 5.2 names are case insensitive. Uppercase them all?
this.name = StringUtils.requireNotNullOrEmpty(name, "name must not be null or empty");
this.name = StringUtils.requireNotNullNorEmpty(name, "name must not be null nor empty");
this.type = Objects.requireNonNull(type);
this.value = StringUtils.requireNotNullOrEmpty(value, "value must not be null or empty");
this.value = StringUtils.requireNotNullNorEmpty(value, "value must not be null nor empty");
if (this.name.length() > 32) {
throw new IllegalArgumentException("Meta Tag names must not be longer then 32 characters (XEP-0347 § 5.2");
}

2
smack-experimental/src/main/java/org/jivesoftware/smackx/iot/element/NodeInfo.java
View file

@ -37,7 +37,7 @@ public final class NodeInfo {
}
public NodeInfo(String nodeId, String sourceId, String cacheType) {
this.nodeId = StringUtils.requireNotNullOrEmpty(nodeId, "Node ID must not be null or empty");
this.nodeId = StringUtils.requireNotNullNorEmpty(nodeId, "Node ID must not be null nor empty");
this.sourceId = sourceId;
this.cacheType = cacheType;
}