Replace Objects.requireNonNull with Preconditions.checkNotNull across services and components for consistent null checks. Add this references for member variables to improve code clarity.

Author: Splatcrafter

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

@@ -165,7 +165,7 @@ public class AetherDataFixersProperties {
      * @return {@code true} if auto-configuration is enabled, {@code false} otherwise
      */
     public boolean isEnabled() {
-        return enabled;
+        return this.enabled;
     }
 
     /**
@@ -187,7 +187,7 @@ public void setEnabled(final boolean enabled) {
      */
     @NotNull
     public DynamicOpsFormat getDefaultFormat() {
-        return defaultFormat;
+        return this.defaultFormat;
     }
 
     /**
@@ -210,7 +210,7 @@ public void setDefaultFormat(@NotNull final DynamicOpsFormat defaultFormat) {
      */
     @Nullable
     public Integer getDefaultCurrentVersion() {
-        return defaultCurrentVersion;
+        return this.defaultCurrentVersion;
     }
 
     /**
@@ -236,7 +236,7 @@ public void setDefaultCurrentVersion(@Nullable final Integer defaultCurrentVersi
      */
     @NotNull
     public Map<String, DataFixerDomainProperties> getDomains() {
-        return domains;
+        return this.domains;
     }
 
     /**
@@ -259,7 +259,7 @@ public void setDomains(@NotNull final Map<String, DataFixerDomainProperties> dom
      */
     @NotNull
     public ActuatorProperties getActuator() {
-        return actuator;
+        return this.actuator;
     }
 
     /**
@@ -282,7 +282,7 @@ public void setActuator(@NotNull final ActuatorProperties actuator) {
      */
     @NotNull
     public MetricsProperties getMetrics() {
-        return metrics;
+        return this.metrics;
     }
 
     /**
@@ -347,7 +347,7 @@ public static class ActuatorProperties {
          * @return {@code true} if schema details are included, {@code false} otherwise
          */
         public boolean isIncludeSchemaDetails() {
-            return includeSchemaDetails;
+            return this.includeSchemaDetails;
         }
 
         /**
@@ -369,7 +369,7 @@ public void setIncludeSchemaDetails(final boolean includeSchemaDetails) {
          * @return {@code true} if fix details are included, {@code false} otherwise
          */
         public boolean isIncludeFixDetails() {
-            return includeFixDetails;
+            return this.includeFixDetails;
         }
 
         /**
@@ -454,7 +454,7 @@ public static class MetricsProperties {
          * @return {@code true} if timing metrics are enabled, {@code false} otherwise
          */
         public boolean isTiming() {
-            return timing;
+            return this.timing;
         }
 
         /**
@@ -475,7 +475,7 @@ public void setTiming(final boolean timing) {
          * @return {@code true} if counting metrics are enabled, {@code false} otherwise
          */
         public boolean isCounting() {
-            return counting;
+            return this.counting;
         }
 
         /**
@@ -498,7 +498,7 @@ public void setCounting(final boolean counting) {
          */
         @NotNull
         public String getDomainTag() {
-            return domainTag;
+            return this.domainTag;
         }
 
         /**

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

@@ -22,6 +22,7 @@
 
 package de.splatgames.aether.datafixers.spring.actuator;
 
+import com.google.common.base.Preconditions;
 import de.splatgames.aether.datafixers.core.AetherDataFixer;
 import de.splatgames.aether.datafixers.spring.autoconfigure.DataFixerRegistry;
 import org.jetbrains.annotations.NotNull;
@@ -32,7 +33,6 @@
 
 import java.util.LinkedHashMap;
 import java.util.Map;
-import java.util.Objects;
 
 /**
  * Custom Spring Boot Actuator endpoint for comprehensive DataFixer management and monitoring.
@@ -170,7 +170,7 @@ public class DataFixerEndpoint {
      * @throws NullPointerException if registry is {@code null}
      */
     public DataFixerEndpoint(@NotNull final DataFixerRegistry registry) {
-        this.registry = Objects.requireNonNull(registry, "registry must not be null");
+        this.registry = Preconditions.checkNotNull(registry, "registry must not be null");
     }
 
     /**
@@ -194,7 +194,7 @@ public DataFixerEndpoint(@NotNull final DataFixerRegistry registry) {
     public DataFixersSummary summary() {
         final Map<String, DomainSummary> domains = new LinkedHashMap<>();
 
-        for (final Map.Entry<String, AetherDataFixer> entry : registry.getAll().entrySet()) {
+        for (final Map.Entry<String, AetherDataFixer> entry : this.registry.getAll().entrySet()) {
             final String domain = entry.getKey();
             final AetherDataFixer fixer = entry.getValue();
 
@@ -240,7 +240,7 @@ public DataFixersSummary summary() {
     @ReadOperation
     @Nullable
     public DomainDetails domainDetails(@Selector final String domain) {
-        final AetherDataFixer fixer = registry.get(domain);
+        final AetherDataFixer fixer = this.registry.get(domain);
         if (fixer == null) {
             return null; // Spring will return 404
         }

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

@@ -22,14 +22,14 @@
 
 package de.splatgames.aether.datafixers.spring.actuator;
 
+import com.google.common.base.Preconditions;
 import de.splatgames.aether.datafixers.core.AetherDataFixer;
 import de.splatgames.aether.datafixers.spring.autoconfigure.DataFixerRegistry;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.boot.actuate.health.Health;
 import org.springframework.boot.actuate.health.HealthIndicator;
 
 import java.util.Map;
-import java.util.Objects;
 
 /**
  * Spring Boot Actuator health indicator for monitoring DataFixer operational status.
@@ -146,7 +146,7 @@ public class DataFixerHealthIndicator implements HealthIndicator {
      * @throws NullPointerException if registry is {@code null}
      */
     public DataFixerHealthIndicator(@NotNull final DataFixerRegistry registry) {
-        this.registry = Objects.requireNonNull(registry, "registry must not be null");
+        this.registry = Preconditions.checkNotNull(registry, "registry must not be null");
     }
 
     /**
@@ -167,7 +167,7 @@ public DataFixerHealthIndicator(@NotNull final DataFixerRegistry registry) {
      */
     @Override
     public Health health() {
-        final Map<String, AetherDataFixer> fixers = registry.getAll();
+        final Map<String, AetherDataFixer> fixers = this.registry.getAll();
 
         if (fixers.isEmpty()) {
             return Health.unknown()

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

@@ -22,6 +22,7 @@
 
 package de.splatgames.aether.datafixers.spring.actuator;
 
+import com.google.common.base.Preconditions;
 import de.splatgames.aether.datafixers.core.AetherDataFixer;
 import de.splatgames.aether.datafixers.spring.autoconfigure.DataFixerRegistry;
 import org.jetbrains.annotations.NotNull;
@@ -30,7 +31,6 @@
 
 import java.util.LinkedHashMap;
 import java.util.Map;
-import java.util.Objects;
 
 /**
  * Spring Boot Actuator info contributor that adds DataFixer metadata to the info endpoint.
@@ -135,7 +135,7 @@ public class DataFixerInfoContributor implements InfoContributor {
      * @throws NullPointerException if registry is {@code null}
      */
     public DataFixerInfoContributor(@NotNull final DataFixerRegistry registry) {
-        this.registry = Objects.requireNonNull(registry, "registry must not be null");
+        this.registry = Preconditions.checkNotNull(registry, "registry must not be null");
     }
 
     /**
@@ -157,7 +157,7 @@ public DataFixerInfoContributor(@NotNull final DataFixerRegistry registry) {
     @Override
     public void contribute(final Info.Builder builder) {
         final Map<String, Object> datafixersInfo = new LinkedHashMap<>();
-        final Map<String, AetherDataFixer> fixers = registry.getAll();
+        final Map<String, AetherDataFixer> fixers = this.registry.getAll();
 
         datafixersInfo.put("domains", fixers.size());
 

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

@@ -148,12 +148,12 @@ public class DataFixerRegistry {
      * @throws NullPointerException     if domain or fixer is {@code null}
      */
     public void register(@NotNull final String domain, @NotNull final AetherDataFixer fixer) {
-        if (fixers.containsKey(domain)) {
+        if (this.fixers.containsKey(domain)) {
             throw new IllegalArgumentException(
                     "DataFixer already registered for domain: " + domain
             );
         }
-        fixers.put(domain, fixer);
+        this.fixers.put(domain, fixer);
     }
 
     /**
@@ -170,7 +170,7 @@ public void register(@NotNull final String domain, @NotNull final AetherDataFixe
      */
     @Nullable
     public AetherDataFixer get(@NotNull final String domain) {
-        return fixers.get(domain);
+        return this.fixers.get(domain);
     }
 
     /**
@@ -191,11 +191,11 @@ public AetherDataFixer get(@NotNull final String domain) {
      */
     @NotNull
     public AetherDataFixer require(@NotNull final String domain) {
-        final AetherDataFixer fixer = fixers.get(domain);
+        final AetherDataFixer fixer = this.fixers.get(domain);
         if (fixer == null) {
             throw new IllegalArgumentException(
                     "No DataFixer registered for domain: " + domain +
-                    ". Available domains: " + fixers.keySet()
+                    ". Available domains: " + this.fixers.keySet()
             );
         }
         return fixer;
@@ -213,7 +213,7 @@ public AetherDataFixer require(@NotNull final String domain) {
      */
     @Nullable
     public AetherDataFixer getDefault() {
-        return fixers.get(DEFAULT_DOMAIN);
+        return this.fixers.get(DEFAULT_DOMAIN);
     }
 
     /**
@@ -226,7 +226,7 @@ public AetherDataFixer getDefault() {
      */
     @NotNull
     public Map<String, AetherDataFixer> getAll() {
-        return Map.copyOf(fixers);
+        return Map.copyOf(this.fixers);
     }
 
     /**
@@ -240,7 +240,7 @@ public Map<String, AetherDataFixer> getAll() {
      */
     @NotNull
     public Set<String> getDomains() {
-        return Set.copyOf(fixers.keySet());
+        return Set.copyOf(this.fixers.keySet());
     }
 
     /**
@@ -254,7 +254,7 @@ public Set<String> getDomains() {
      * @throws NullPointerException if domain is {@code null}
      */
     public boolean contains(@NotNull final String domain) {
-        return fixers.containsKey(domain);
+        return this.fixers.containsKey(domain);
     }
 
     /**
@@ -265,7 +265,7 @@ public boolean contains(@NotNull final String domain) {
      * @return the number of registered fixers, always non-negative
      */
     public int size() {
-        return fixers.size();
+        return this.fixers.size();
     }
 
     /**
@@ -278,6 +278,6 @@ public int size() {
      * @return {@code true} if no DataFixers are registered, {@code false} otherwise
      */
     public boolean isEmpty() {
-        return fixers.isEmpty();
+        return this.fixers.isEmpty();
     }
 }

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

@@ -122,7 +122,7 @@ public class DataFixerDomainProperties {
      */
     @Nullable
     public Integer getCurrentVersion() {
-        return currentVersion;
+        return this.currentVersion;
     }
 
     /**
@@ -149,7 +149,7 @@ public void setCurrentVersion(@Nullable final Integer currentVersion) {
      * @return {@code true} if this domain is the primary bean, {@code false} otherwise
      */
     public boolean isPrimary() {
-        return primary;
+        return this.primary;
     }
 
     /**
@@ -177,7 +177,7 @@ public void setPrimary(final boolean primary) {
      */
     @Nullable
     public String getDescription() {
-        return description;
+        return this.description;
     }
 
     /**