Skip to content

Commit e4e127d

Browse files
committed
Use Preconditions.checkNotNull for null checks across DataFixerRegistry and AetherDataFixersProperties to enforce consistent validation.
1 parent 0291018 commit e4e127d

2 files changed

Lines changed: 11 additions & 4 deletions

File tree

aether-datafixers-spring-boot-starter/src/main/java/de/splatgames/aether/datafixers/spring/AetherDataFixersProperties.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222

2323
package de.splatgames.aether.datafixers.spring;
2424

25+
import com.google.common.base.Preconditions;
2526
import de.splatgames.aether.datafixers.spring.config.DataFixerDomainProperties;
2627
import de.splatgames.aether.datafixers.spring.config.DynamicOpsFormat;
2728
import org.jetbrains.annotations.NotNull;
@@ -197,7 +198,7 @@ public DynamicOpsFormat getDefaultFormat() {
197198
* @throws NullPointerException if defaultFormat is {@code null}
198199
*/
199200
public void setDefaultFormat(@NotNull final DynamicOpsFormat defaultFormat) {
200-
this.defaultFormat = defaultFormat;
201+
this.defaultFormat = Preconditions.checkNotNull(defaultFormat, "defaultFormat must not be null");
201202
}
202203

203204
/**
@@ -246,7 +247,7 @@ public Map<String, DataFixerDomainProperties> getDomains() {
246247
* @throws NullPointerException if domains is {@code null}
247248
*/
248249
public void setDomains(@NotNull final Map<String, DataFixerDomainProperties> domains) {
249-
this.domains = domains;
250+
this.domains = Preconditions.checkNotNull(domains, "domains must not be null");
250251
}
251252

252253
/**
@@ -269,7 +270,7 @@ public ActuatorProperties getActuator() {
269270
* @throws NullPointerException if actuator is {@code null}
270271
*/
271272
public void setActuator(@NotNull final ActuatorProperties actuator) {
272-
this.actuator = actuator;
273+
this.actuator = Preconditions.checkNotNull(actuator, "actuator must not be null");
273274
}
274275

275276
/**
@@ -292,7 +293,7 @@ public MetricsProperties getMetrics() {
292293
* @throws NullPointerException if metrics is {@code null}
293294
*/
294295
public void setMetrics(@NotNull final MetricsProperties metrics) {
295-
this.metrics = metrics;
296+
this.metrics = Preconditions.checkNotNull(metrics, "metrics must not be null");
296297
}
297298

298299
/**

aether-datafixers-spring-boot-starter/src/main/java/de/splatgames/aether/datafixers/spring/autoconfigure/DataFixerRegistry.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222

2323
package de.splatgames.aether.datafixers.spring.autoconfigure;
2424

25+
import com.google.common.base.Preconditions;
2526
import de.splatgames.aether.datafixers.core.AetherDataFixer;
2627
import org.jetbrains.annotations.NotNull;
2728
import org.jetbrains.annotations.Nullable;
@@ -148,6 +149,8 @@ public class DataFixerRegistry {
148149
* @throws NullPointerException if domain or fixer is {@code null}
149150
*/
150151
public void register(@NotNull final String domain, @NotNull final AetherDataFixer fixer) {
152+
Preconditions.checkNotNull(domain, "domain must not be null");
153+
Preconditions.checkNotNull(fixer, "fixer must not be null");
151154
if (this.fixers.containsKey(domain)) {
152155
throw new IllegalArgumentException(
153156
"DataFixer already registered for domain: " + domain
@@ -170,6 +173,7 @@ public void register(@NotNull final String domain, @NotNull final AetherDataFixe
170173
*/
171174
@Nullable
172175
public AetherDataFixer get(@NotNull final String domain) {
176+
Preconditions.checkNotNull(domain, "domain must not be null");
173177
return this.fixers.get(domain);
174178
}
175179

@@ -191,6 +195,7 @@ public AetherDataFixer get(@NotNull final String domain) {
191195
*/
192196
@NotNull
193197
public AetherDataFixer require(@NotNull final String domain) {
198+
Preconditions.checkNotNull(domain, "domain must not be null");
194199
final AetherDataFixer fixer = this.fixers.get(domain);
195200
if (fixer == null) {
196201
throw new IllegalArgumentException(
@@ -254,6 +259,7 @@ public Set<String> getDomains() {
254259
* @throws NullPointerException if domain is {@code null}
255260
*/
256261
public boolean contains(@NotNull final String domain) {
262+
Preconditions.checkNotNull(domain, "domain must not be null");
257263
return this.fixers.containsKey(domain);
258264
}
259265

0 commit comments

Comments
 (0)