narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

Use factories to generate JIDs

Browse source
This commit is contained in:
Sam Whited 2014-11-05 09:40:16 -05:00
parent a11878b139
commit a990861316
1 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/main/java/eu/siacs/conversations/xmpp/jid/Jid.java
View file

@ -30,22 +30,26 @@ public final class Jid {
return IDN.toUnicode(resourcepart); return IDN.toUnicode(resourcepart);
} }
// Special private constructor that doesn't do any checking... public Jid fromString(final String jid) throws InvalidJidException {
private Jid(final String localpart, final String domainpart) { return new Jid(jid);
this.localpart = localpart; }
this.domainpart = domainpart;
this.resourcepart = ""; public static Jid fromParts(final String localpart,
if (localpart.isEmpty()) { final String domainpart,
this.displayjid = domainpart; final String resourcepart) throws InvalidJidException {
String out;
if (localpart == null || localpart.isEmpty()) {
out = domainpart;
} else { } else {
this.displayjid = localpart + "@" + domainpart; out = localpart + "@" + domainpart;
} }
if (resourcepart != null && !resourcepart.isEmpty()) {
out = out + "/" + resourcepart;
}
return new Jid(out);
} }
// Note: If introducing a mutable instance variable for some reason, make the constructor private Jid(final String jid) throws InvalidJidException {
// private and add a factory method to ensure thread safety and hash-cach-ability (tm).
public Jid(final String jid) throws InvalidJidException {
// Hackish Android way to count the number of chars in a string... should work everywhere. // Hackish Android way to count the number of chars in a string... should work everywhere.
final int atCount = jid.length() - jid.replace("@", "").length(); final int atCount = jid.length() - jid.replace("@", "").length();
final int slashCount = jid.length() - jid.replace("/", "").length(); final int slashCount = jid.length() - jid.replace("/", "").length();
@ -118,7 +122,12 @@ public final class Jid {
} }
public Jid getBareJid() { public Jid getBareJid() {
return displayjid.contains("/") ? new Jid(localpart, domainpart) : this; try {
return resourcepart.isEmpty() ? this : fromParts(localpart, domainpart, "");
} catch (final InvalidJidException e) {
// This should never happen due to the contracts we have in place.
return null;
}
} }
@Override @Override
@ -133,12 +142,7 @@ public final class Jid {
final Jid jid = (Jid) o; final Jid jid = (Jid) o;
// Since we're immutable, the JVM will cache hashcodes, making this very fast.
// I'm assuming Dalvik does the same sorts of optimizations...
// Since the hashcode does not include the displayJID it can be used for IDN comparison as
// well.
return jid.hashCode() == this.hashCode(); return jid.hashCode() == this.hashCode();
} }
@Override @Override