Skip to content

Commit 20d1dfe

Browse files
committed
cleanup nullability annotations and relay hashcode
1 parent 57d4998 commit 20d1dfe

4 files changed

Lines changed: 29 additions & 35 deletions

File tree

pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,6 @@
4141
<version>1.9.0</version>
4242
</dependency>
4343

44-
<!-- https://mvnrepository.com/artifact/org.jetbrains/annotations -->
45-
<dependency>
46-
<groupId>org.jetbrains</groupId>
47-
<artifactId>annotations</artifactId>
48-
<version>24.1.0</version>
49-
</dependency>
50-
5144
<!-- Testing -->
5245
<dependency>
5346
<groupId>org.springframework.boot</groupId>

src/main/java/it/aboutbits/springboot/toolbox/type/EmailAddress.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package it.aboutbits.springboot.toolbox.type;
22

33
import it.aboutbits.springboot.toolbox.validation.util.EmailAddressValidator;
4-
import org.jetbrains.annotations.NotNull;
4+
import lombok.NonNull;
55

66
/**
77
* A record representing an email address, validated and stored in lowercase.
@@ -24,13 +24,14 @@ public EmailAddress(String value) {
2424
this.value = value.toLowerCase();
2525
}
2626

27+
@NonNull
2728
@Override
2829
public String toString() {
2930
return value;
3031
}
3132

3233
@Override
33-
public int compareTo(@NotNull EmailAddress o) {
34+
public int compareTo(@NonNull EmailAddress o) {
3435
return value().compareTo(o.value());
3536
}
3637
}

src/main/java/it/aboutbits/springboot/toolbox/type/Iban.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package it.aboutbits.springboot.toolbox.type;
22

33
import it.aboutbits.springboot.toolbox.validation.util.IbanValidator;
4-
import org.jetbrains.annotations.NotNull;
4+
import lombok.NonNull;
55

66
import java.util.Optional;
77

@@ -20,6 +20,7 @@ public Iban(String value) {
2020
this.value = value.toUpperCase();
2121
}
2222

23+
@NonNull
2324
@Override
2425
public String toString() {
2526
return value;
@@ -30,6 +31,7 @@ public String toString() {
3031
*
3132
* @return An {@code Optional} containing the ABI value if the IBAN is Italian, or an empty {@code Optional} otherwise.
3233
*/
34+
@NonNull
3335
public Optional<String> getAbiIfItalian() {
3436
var iban = value();
3537

@@ -40,7 +42,7 @@ public Optional<String> getAbiIfItalian() {
4042
}
4143

4244
@Override
43-
public int compareTo(@NotNull Iban o) {
45+
public int compareTo(@NonNull Iban o) {
4446
return value().compareTo(o.value());
4547
}
4648
}

src/main/java/it/aboutbits/springboot/toolbox/type/ScaledBigDecimal.java

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
package it.aboutbits.springboot.toolbox.type;
22

33
import lombok.NonNull;
4-
import org.jetbrains.annotations.NotNull;
54

65
import java.math.BigDecimal;
76
import java.math.BigInteger;
87
import java.math.MathContext;
98
import java.math.RoundingMode;
10-
import java.util.Objects;
119

1210
/**
1311
* A record that represents a scaled BigDecimal with a fixed MathContext.
@@ -108,102 +106,102 @@ public static ScaledBigDecimal valueOf(@NonNull String value) {
108106
return new ScaledBigDecimal(value);
109107
}
110108

111-
@NotNull
109+
@NonNull
112110
public ScaledBigDecimal add(@NonNull ScaledBigDecimal other) {
113111
return new ScaledBigDecimal(this.value().add(other.value()));
114112
}
115113

116-
@NotNull
114+
@NonNull
117115
public ScaledBigDecimal subtract(@NonNull ScaledBigDecimal other) {
118116
return new ScaledBigDecimal(this.value().subtract(other.value()));
119117
}
120118

121-
@NotNull
119+
@NonNull
122120
public ScaledBigDecimal multiply(@NonNull ScaledBigDecimal other) {
123121
return new ScaledBigDecimal(this.value().multiply(other.value()));
124122
}
125123

126-
@NotNull
124+
@NonNull
127125
public ScaledBigDecimal divide(@NonNull ScaledBigDecimal other) {
128126
return new ScaledBigDecimal(this.value().divide(other.value(), MATH_CONTEXT));
129127
}
130128

131-
@NotNull
129+
@NonNull
132130
public ScaledBigDecimal add(@NonNull BigDecimal other) {
133131
return new ScaledBigDecimal(this.value().add(other));
134132
}
135133

136-
@NotNull
134+
@NonNull
137135
public ScaledBigDecimal subtract(@NonNull BigDecimal other) {
138136
return new ScaledBigDecimal(this.value().subtract(other));
139137
}
140138

141-
@NotNull
139+
@NonNull
142140
public ScaledBigDecimal multiply(@NonNull BigDecimal other) {
143141
return new ScaledBigDecimal(this.value().multiply(other));
144142
}
145143

146-
@NotNull
144+
@NonNull
147145
public ScaledBigDecimal divide(@NonNull BigDecimal other) {
148146
return new ScaledBigDecimal(this.value().divide(other, MATH_CONTEXT));
149147
}
150148

151-
@NotNull
149+
@NonNull
152150
public ScaledBigDecimal remainder(@NonNull ScaledBigDecimal divisor) {
153151
return new ScaledBigDecimal(this.value().remainder(divisor.value(), MATH_CONTEXT));
154152
}
155153

156-
@NotNull
154+
@NonNull
157155
public ScaledBigDecimal remainder(@NonNull BigDecimal divisor) {
158156
return new ScaledBigDecimal(this.value().remainder(divisor, MATH_CONTEXT));
159157
}
160158

161-
@NotNull
159+
@NonNull
162160
public ScaledBigDecimal sqrt() {
163161
return new ScaledBigDecimal(this.value().sqrt(MATH_CONTEXT));
164162
}
165163

166-
@NotNull
164+
@NonNull
167165
public ScaledBigDecimal pow(int n) {
168166
return new ScaledBigDecimal(this.value().pow(n, MATH_CONTEXT));
169167
}
170168

171-
@NotNull
169+
@NonNull
172170
public ScaledBigDecimal abs() {
173171
return new ScaledBigDecimal(this.value().abs(MATH_CONTEXT));
174172
}
175173

176-
@NotNull
174+
@NonNull
177175
public ScaledBigDecimal negate() {
178176
return new ScaledBigDecimal(this.value().negate(MATH_CONTEXT));
179177
}
180178

181-
@NotNull
179+
@NonNull
182180
public ScaledBigDecimal min(@NonNull ScaledBigDecimal val) {
183181
return new ScaledBigDecimal(this.value().min(val.value()));
184182
}
185183

186-
@NotNull
184+
@NonNull
187185
public ScaledBigDecimal min(@NonNull BigDecimal val) {
188186
return new ScaledBigDecimal(this.value().min(val));
189187
}
190188

191-
@NotNull
189+
@NonNull
192190
public ScaledBigDecimal max(@NonNull ScaledBigDecimal val) {
193191
return new ScaledBigDecimal(this.value().max(val.value()));
194192
}
195193

196-
@NotNull
194+
@NonNull
197195
public ScaledBigDecimal max(@NonNull BigDecimal val) {
198196
return new ScaledBigDecimal(this.value().max(val));
199197
}
200198

201-
@NotNull
199+
@NonNull
202200
public BigDecimal toBigDecimal(int scale) {
203201
return this.value().setScale(scale, RoundingMode.HALF_UP);
204202
}
205203

206-
@NotNull
204+
@NonNull
207205
public ScaledBigDecimal roundToScale(int scale) {
208206
return new ScaledBigDecimal(this.value().setScale(scale, RoundingMode.HALF_UP));
209207
}
@@ -223,11 +221,11 @@ public boolean equals(Object o) {
223221

224222
@Override
225223
public int hashCode() {
226-
return Objects.hash(MATH_CONTEXT, value());
224+
return value().hashCode();
227225
}
228226

229227
@Override
230-
public int compareTo(@NotNull ScaledBigDecimal o) {
228+
public int compareTo(@NonNull ScaledBigDecimal o) {
231229
return this.value().compareTo(o.value());
232230
}
233231
}

0 commit comments

Comments
 (0)