Skip to content

Commit 4257592

Browse files
committed
Limit double comparison precision to 1e-13 in User model
1 parent b414e32 commit 4257592

File tree

1 file changed

+30
-53
lines changed
  • src/main/java/com/github/fabienrenaud/jjb/model

1 file changed

+30
-53
lines changed

src/main/java/com/github/fabienrenaud/jjb/model/Users.java

Lines changed: 30 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.dslplatform.json.JsonAttribute;
77

88
import java.util.List;
9+
import java.util.Objects;
910

1011
/**
1112
* Created by frenaud on 7/3/16.
@@ -94,64 +95,40 @@ public static final class User {
9495

9596
@Override
9697
public boolean equals(Object o) {
97-
if (this == o) return true;
98-
if (!(o instanceof User)) return false;
99-
98+
if (this == o) {
99+
return true;
100+
}
101+
if (!(o instanceof User)) {
102+
return false;
103+
}
100104
User user = (User) o;
101-
102-
if (index != user.index) return false;
103-
if (isActive != user.isActive) return false;
104-
if (age != user.age) return false;
105-
if (Double.compare(user.latitude, latitude) != 0) return false;
106-
if (Double.compare(user.longitude, longitude) != 0) return false;
107-
if (_id != null ? !_id.equals(user._id) : user._id != null) return false;
108-
if (guid != null ? !guid.equals(user.guid) : user.guid != null) return false;
109-
if (balance != null ? !balance.equals(user.balance) : user.balance != null) return false;
110-
if (picture != null ? !picture.equals(user.picture) : user.picture != null) return false;
111-
if (eyeColor != null ? !eyeColor.equals(user.eyeColor) : user.eyeColor != null) return false;
112-
if (name != null ? !name.equals(user.name) : user.name != null) return false;
113-
if (gender != null ? !gender.equals(user.gender) : user.gender != null) return false;
114-
if (company != null ? !company.equals(user.company) : user.company != null) return false;
115-
if (email != null ? !email.equals(user.email) : user.email != null) return false;
116-
if (phone != null ? !phone.equals(user.phone) : user.phone != null) return false;
117-
if (address != null ? !address.equals(user.address) : user.address != null) return false;
118-
if (about != null ? !about.equals(user.about) : user.about != null) return false;
119-
if (registered != null ? !registered.equals(user.registered) : user.registered != null) return false;
120-
if (tags != null ? !tags.equals(user.tags) : user.tags != null) return false;
121-
if (friends != null ? !friends.equals(user.friends) : user.friends != null) return false;
122-
if (greeting != null ? !greeting.equals(user.greeting) : user.greeting != null) return false;
123-
return favoriteFruit != null ? favoriteFruit.equals(user.favoriteFruit) : user.favoriteFruit == null;
105+
return index == user.index &&
106+
isActive == user.isActive &&
107+
age == user.age &&
108+
Double.compare(user.latitude, latitude) < 1e-13 &&
109+
Double.compare(user.longitude, longitude) < 1e-13 &&
110+
Objects.equals(_id, user._id) &&
111+
Objects.equals(guid, user.guid) &&
112+
Objects.equals(balance, user.balance) &&
113+
Objects.equals(picture, user.picture) &&
114+
Objects.equals(eyeColor, user.eyeColor) &&
115+
Objects.equals(name, user.name) &&
116+
Objects.equals(gender, user.gender) &&
117+
Objects.equals(company, user.company) &&
118+
Objects.equals(email, user.email) &&
119+
Objects.equals(phone, user.phone) &&
120+
Objects.equals(address, user.address) &&
121+
Objects.equals(about, user.about) &&
122+
Objects.equals(registered, user.registered) &&
123+
Objects.equals(tags, user.tags) &&
124+
Objects.equals(friends, user.friends) &&
125+
Objects.equals(greeting, user.greeting) &&
126+
Objects.equals(favoriteFruit, user.favoriteFruit);
124127
}
125128

126129
@Override
127130
public int hashCode() {
128-
int result;
129-
long temp;
130-
result = _id != null ? _id.hashCode() : 0;
131-
result = 31 * result + index;
132-
result = 31 * result + (guid != null ? guid.hashCode() : 0);
133-
result = 31 * result + (isActive ? 1 : 0);
134-
result = 31 * result + (balance != null ? balance.hashCode() : 0);
135-
result = 31 * result + (picture != null ? picture.hashCode() : 0);
136-
result = 31 * result + age;
137-
result = 31 * result + (eyeColor != null ? eyeColor.hashCode() : 0);
138-
result = 31 * result + (name != null ? name.hashCode() : 0);
139-
result = 31 * result + (gender != null ? gender.hashCode() : 0);
140-
result = 31 * result + (company != null ? company.hashCode() : 0);
141-
result = 31 * result + (email != null ? email.hashCode() : 0);
142-
result = 31 * result + (phone != null ? phone.hashCode() : 0);
143-
result = 31 * result + (address != null ? address.hashCode() : 0);
144-
result = 31 * result + (about != null ? about.hashCode() : 0);
145-
result = 31 * result + (registered != null ? registered.hashCode() : 0);
146-
temp = Double.doubleToLongBits(latitude);
147-
result = 31 * result + (int) (temp ^ (temp >>> 32));
148-
temp = Double.doubleToLongBits(longitude);
149-
result = 31 * result + (int) (temp ^ (temp >>> 32));
150-
result = 31 * result + (tags != null ? tags.hashCode() : 0);
151-
result = 31 * result + (friends != null ? friends.hashCode() : 0);
152-
result = 31 * result + (greeting != null ? greeting.hashCode() : 0);
153-
result = 31 * result + (favoriteFruit != null ? favoriteFruit.hashCode() : 0);
154-
return result;
131+
return Objects.hash(_id, index, guid, isActive, balance, picture, age, eyeColor, name, gender, company, email, phone, address, about, registered, tags, friends, greeting, favoriteFruit);
155132
}
156133

157134
@Override

0 commit comments

Comments
 (0)