dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
dashevchenko 2023-02-21 12:11:11 +02:00
parent fff1f555e8
commit 4ddcd99e44
1 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
common/data/src/main/java/org/thingsboard/server/common/data/security/UserCredentials.java
View File

@ -30,6 +30,7 @@ import java.util.Objects;
import static org.thingsboard.server.common.data.SearchTextBasedWithAdditionalInfo.getJson; import static org.thingsboard.server.common.data.SearchTextBasedWithAdditionalInfo.getJson;
import static org.thingsboard.server.common.data.SearchTextBasedWithAdditionalInfo.setJson; import static org.thingsboard.server.common.data.SearchTextBasedWithAdditionalInfo.setJson;
@EqualsAndHashCode(callSuper = true)
public class UserCredentials extends BaseData<UserCredentialsId> { public class UserCredentials extends BaseData<UserCredentialsId> {
private static final long serialVersionUID = -2108436378880529163L; private static final long serialVersionUID = -2108436378880529163L;
@ -112,24 +113,6 @@ public class UserCredentials extends BaseData<UserCredentialsId> {
this.resetToken = resetToken; this.resetToken = resetToken;
} }
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
if (!super.equals(o)) return false;
UserCredentials that = (UserCredentials) o;
return enabled == that.enabled && userId.equals(that.userId) && Objects.equals(password, that.password)
&& Objects.equals(activateToken, that.activateToken) && Objects.equals(resetToken, that.resetToken)
&& Arrays.equals(additionalInfoBytes, that.additionalInfoBytes);
}
@Override
public int hashCode() {
int result = Objects.hash(super.hashCode(), userId, enabled, password, activateToken, resetToken);
result = 31 * result + Arrays.hashCode(additionalInfoBytes);
return result;
}
@Override @Override
public String toString() { public String toString() {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();