mirror of
https://github.com/pgpainless/pgpainless.git
synced 2024-11-23 12:52:07 +01:00
Code review
This commit is contained in:
parent
e5aaebe174
commit
57f7440039
1 changed files with 10 additions and 5 deletions
|
@ -16,7 +16,6 @@
|
||||||
|
|
||||||
package org.pgpainless.key.util;
|
package org.pgpainless.key.util;
|
||||||
|
|
||||||
// @SuppressWarnings("unused")
|
|
||||||
public final class UserId implements CharSequence {
|
public final class UserId implements CharSequence {
|
||||||
public static final class Builder {
|
public static final class Builder {
|
||||||
private String name;
|
private String name;
|
||||||
|
@ -73,7 +72,7 @@ public final class UserId implements CharSequence {
|
||||||
private final String name;
|
private final String name;
|
||||||
private final String comment;
|
private final String comment;
|
||||||
private final String email;
|
private final String email;
|
||||||
private Integer hash;
|
private long hash = Long.MAX_VALUE;
|
||||||
|
|
||||||
private UserId(String name, String comment, String email) {
|
private UserId(String name, String comment, String email) {
|
||||||
this.name = name;
|
this.name = name;
|
||||||
|
@ -132,6 +131,11 @@ public final class UserId implements CharSequence {
|
||||||
return asString(false);
|
return asString(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns a string representation of the object.
|
||||||
|
* @param ignoreEmptyValues Flag which indicates that empty string values should not be outputted.
|
||||||
|
* @return a string representation of the object.
|
||||||
|
*/
|
||||||
public String asString(boolean ignoreEmptyValues) {
|
public String asString(boolean ignoreEmptyValues) {
|
||||||
StringBuilder sb = new StringBuilder();
|
StringBuilder sb = new StringBuilder();
|
||||||
if (name != null && (!ignoreEmptyValues || !name.isEmpty())) {
|
if (name != null && (!ignoreEmptyValues || !name.isEmpty())) {
|
||||||
|
@ -155,14 +159,15 @@ public final class UserId implements CharSequence {
|
||||||
if (o == this) return true;
|
if (o == this) return true;
|
||||||
if (!(o instanceof UserId)) return false;
|
if (!(o instanceof UserId)) return false;
|
||||||
final UserId other = (UserId) o;
|
final UserId other = (UserId) o;
|
||||||
return isEqualComponent(name, other.name, false) && isEqualComponent(comment, other.comment, false)
|
return isEqualComponent(name, other.name, false)
|
||||||
|
&& isEqualComponent(comment, other.comment, false)
|
||||||
&& isEqualComponent(email, other.email, true);
|
&& isEqualComponent(email, other.email, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int hashCode() {
|
public int hashCode() {
|
||||||
if (hash != null) {
|
if (hash != Long.MAX_VALUE) {
|
||||||
return hash;
|
return (int) hash;
|
||||||
} else {
|
} else {
|
||||||
int hash = 7;
|
int hash = 7;
|
||||||
hash = 31 * hash + (name == null ? 0 : name.hashCode());
|
hash = 31 * hash + (name == null ? 0 : name.hashCode());
|
||||||
|
|
Loading…
Reference in a new issue