Refactor MoSAPI models to records and address review nits

- Convert model classes to Java records for conciseness and immutability.
- Update unit tests to use Java text blocks for improved JSON readability.
- Simplify service and action layers by removing redundant logic and logging.
- Fix configuration nits regarding primitive types and comment formatting.

Author: njshah301

core/src/main/java/google/registry/config/RegistryConfig.java

@@ -1464,7 +1464,7 @@ public static ImmutableSet<String> provideMosapiServices(RegistryConfigSettings
 
     @Provides
     @Config("mosapiTldThreadCnt")
-    public static Integer provideMosapiTldThreads(RegistryConfigSettings config) {
+    public static int provideMosapiTldThreads(RegistryConfigSettings config) {
       return config.mosapi.tldThreadCnt;
     }
 

core/src/main/java/google/registry/config/RegistryConfigSettings.java

@@ -272,6 +272,6 @@ public static class MosApi {
     public String entityType;
     public List<String> tlds;
     public List<String> services;
-    public Integer tldThreadCnt;
+    public int tldThreadCnt;
   }
 }

core/src/main/java/google/registry/config/files/default-config.yaml

@@ -642,7 +642,7 @@ mosapi:
   - "epp"
   - "dnssec"
 
-  #Provides a fixed thread pool for parallel TLD processing.
+  # Provides a fixed thread pool for parallel TLD processing.
   # @see <a href="https://www.icann.org/mosapi-specification.pdf">
   # ICANN MoSAPI Specification, Section 12.3</a>
   tldThreadCnt: 4

core/src/main/java/google/registry/mosapi/GetServiceStateAction.java

@@ -14,7 +14,6 @@
 
 package google.registry.mosapi;
 
-import com.google.common.flogger.FluentLogger;
 import com.google.common.net.MediaType;
 import com.google.gson.Gson;
 import google.registry.request.Action;
@@ -32,7 +31,6 @@
     method = Action.Method.GET,
     auth = Auth.AUTH_ADMIN)
 public class GetServiceStateAction implements Runnable {
-  private static final FluentLogger logger = FluentLogger.forEnclosingClass();
 
   public static final String PATH = "/_dr/mosapi/getServiceState";
   public static final String TLD_PARAM = "tld";
@@ -64,8 +62,6 @@ public void run() {
         response.setPayload(gson.toJson(stateService.getAllServiceStateSummaries()));
       }
     } catch (MosApiException e) {
-      logger.atWarning().withCause(e).log(
-          "MoSAPI client failed to get Service state for %s TLD", tld.orElse("all"));
       throw new ServiceUnavailableException("Error fetching MoSAPI service state.");
     }
   }

core/src/main/java/google/registry/mosapi/MosApiStateService.java

@@ -32,6 +32,7 @@
 
 /** A service that provides business logic for interacting with MoSAPI Service State. */
 public class MosApiStateService {
+
   private static final FluentLogger logger = FluentLogger.forEnclosingClass();
   private final ServiceMonitoringClient serviceMonitoringClient;
   private final ExecutorService tldExecutor;
@@ -91,24 +92,24 @@ public AllServicesStateResponse getAllServiceStateSummaries() {
 
   private ServiceStateSummary transformToSummary(TldServiceState rawState) {
     List<ServiceStatus> activeIncidents = null;
-    if (DOWN_STATUS.equalsIgnoreCase(rawState.getStatus())) {
+    if (DOWN_STATUS.equalsIgnoreCase(rawState.status())) {
       activeIncidents =
-          rawState.getServiceStatuses().entrySet().stream()
+          rawState.serviceStatuses().entrySet().stream()
               .filter(
                   entry -> {
                     ServiceStatus serviceStatus = entry.getValue();
-                    return serviceStatus.getIncidents() != null
-                        && !serviceStatus.getIncidents().isEmpty();
+                    return serviceStatus.incidents() != null
+                        && !serviceStatus.incidents().isEmpty();
                   })
               .map(
                   entry ->
                       new ServiceStatus(
                           // key is the service name
                           entry.getKey(),
-                          entry.getValue().getEmergencyThreshold(),
-                          entry.getValue().getIncidents()))
+                          entry.getValue().emergencyThreshold(),
+                          entry.getValue().incidents()))
               .collect(toImmutableList());
     }
-    return new ServiceStateSummary(rawState.getTld(), rawState.getStatus(), activeIncidents);
+    return new ServiceStateSummary(rawState.tld(), rawState.status(), activeIncidents);
   }
 }

core/src/main/java/google/registry/mosapi/ServiceMonitoringClient.java

@@ -25,6 +25,7 @@
 
 /** Facade for MoSAPI's service monitoring endpoints. */
 public class ServiceMonitoringClient {
+
   private final MosApiClient mosApiClient;
   private final Gson gson;
 

core/src/main/java/google/registry/mosapi/model/AllServicesStateResponse.java

@@ -26,18 +26,11 @@
  * @see <a href="https://www.icann.org/mosapi-specification.pdf">ICANN MoSAPI Specification, Section
  *     5.1</a>
  */
-public final class AllServicesStateResponse {
+public record AllServicesStateResponse(
+    // A list of state summaries for each monitored service (e.g. DNS, RDDS, etc.)
+    @Expose @SerializedName("serviceStates") List<ServiceStateSummary> serviceStates) {
 
-  // A list of state summaries for each monitored service (e.g. DNS, RDDS, etc.)
-  @Expose
-  @SerializedName("serviceStates")
-  private final List<ServiceStateSummary> serviceStates;
-
-  public AllServicesStateResponse(List<ServiceStateSummary> serviceStates) {
-    this.serviceStates = serviceStates;
-  }
-
-  public List<ServiceStateSummary> getServiceStates() {
-    return serviceStates;
+  public AllServicesStateResponse {
+    serviceStates = (serviceStates == null) ? List.of() : List.copyOf(serviceStates);
   }
 }

core/src/main/java/google/registry/mosapi/model/IncidentSummary.java

@@ -24,54 +24,9 @@
  * @see <a href="https://www.icann.org/mosapi-specification.pdf">ICANN MoSAPI Specification, Section
  *     5.1</a>
  */
-public final class IncidentSummary {
-  @Expose
-  @SerializedName("incidentID")
-  private String incidentID;
-
-  @Expose
-  @SerializedName("startTime")
-  private long startTime;
-
-  @Expose
-  @SerializedName("falsePositive")
-  private boolean falsePositive;
-
-  @Expose
-  @SerializedName("state")
-  private String state;
-
-  @Expose
-  @SerializedName("endTime")
-  @Nullable
-  private Long endTime;
-
-  public IncidentSummary(
-      String incidentID, long startTime, boolean falsePositive, String state, Long endTime) {
-    this.incidentID = incidentID;
-    this.startTime = startTime;
-    this.falsePositive = falsePositive;
-    this.state = state;
-    this.endTime = endTime;
-  }
-
-  public String getIncidentID() {
-    return incidentID;
-  }
-
-  public long getStartTime() {
-    return startTime;
-  }
-
-  public boolean isFalsePositive() {
-    return falsePositive;
-  }
-
-  public String getState() {
-    return state;
-  }
-
-  public Long getEndTime() {
-    return endTime;
-  }
-}
+public record IncidentSummary(
+    @Expose @SerializedName("incidentID") String incidentID,
+    @Expose @SerializedName("startTime") long startTime,
+    @Expose @SerializedName("falsePositive") boolean falsePositive,
+    @Expose @SerializedName("state") String state,
+    @Expose @SerializedName("endTime") @Nullable Long endTime) {}

core/src/main/java/google/registry/mosapi/model/ServiceStateSummary.java

@@ -28,42 +28,12 @@
  * @see <a href="https://www.icann.org/mosapi-specification.pdf">ICANN MoSAPI Specification, Section
  *     5.1</a>
  */
-public final class ServiceStateSummary {
-  @Expose
-  @SerializedName("tld")
-  private final String tld;
+public record ServiceStateSummary(
+    @Expose @SerializedName("tld") String tld,
+    @Expose @SerializedName("overallStatus") String overallStatus,
+    @Expose @SerializedName("activeIncidents") @Nullable List<ServiceStatus> activeIncidents) {
 
-  // The overall status of the TLD (e.g. "Up", "Down", "UP-inconclusive")
-  @Expose
-  @SerializedName("overallStatus")
-  private final String overallStatus;
-
-  /*
-    A list of summaries for services that currently have active incidents. May be null or empty if
-    the status is "up"
-  */
-  @Expose
-  @SerializedName("activeIncidents")
-  @Nullable
-  private final List<ServiceStatus> activeIncidents;
-
-  public ServiceStateSummary(
-      String tld, String overallStatus, @Nullable List<ServiceStatus> activeIncidents) {
-    this.tld = tld;
-    this.overallStatus = overallStatus;
-    this.activeIncidents = activeIncidents;
-  }
-
-  public String getTld() {
-    return tld;
-  }
-
-  public String getOverallStatus() {
-    return overallStatus;
-  }
-
-  @Nullable
-  public List<ServiceStatus> getActiveIncidents() {
-    return activeIncidents;
+  public ServiceStateSummary {
+    activeIncidents = activeIncidents == null ? null : List.copyOf(activeIncidents);
   }
 }

core/src/main/java/google/registry/mosapi/model/ServiceStatus.java

@@ -19,44 +19,20 @@
 import java.util.List;
 
 /** Represents the status of a single monitored service. */
-public final class ServiceStatus {
-  /**
-   * A JSON string that contains the status of the Service as seen from the monitoring system.
-   * Possible values include "Up", "Down", "Disabled", "UP-inconclusive-no-data", etc.
-   *
-   * @see <a href="https://www.icann.org/mosapi-specification.pdf">ICANN MoSAPI Specification,
-   *     Section 5.1</a>
-   */
-  @Expose
-  @SerializedName("status")
-  private String status;
-
-  //  A JSON number that contains the current percentage of the Emergency Threshold
-  //  of the Service. A value of "0" specifies that there are no Incidents
-  //  affecting the threshold.
-  @Expose
-  @SerializedName("emergencyThreshold")
-  private double emergencyThreshold;
-
-  @Expose
-  @SerializedName("incidents")
-  private List<IncidentSummary> incidents;
-
-  public ServiceStatus(String status, double emergencyThreshold, List<IncidentSummary> incidents) {
-    this.status = status;
-    this.emergencyThreshold = emergencyThreshold;
-    this.incidents = incidents;
-  }
-
-  public String getStatus() {
-    return status;
-  }
-
-  public double getEmergencyThreshold() {
-    return emergencyThreshold;
-  }
-
-  public List<IncidentSummary> getIncidents() {
-    return incidents;
+public record ServiceStatus(
+    /**
+     * A JSON string that contains the status of the Service as seen from the monitoring system.
+     * Possible values include "Up", "Down", "Disabled", "UP-inconclusive-no-data", etc.
+     */
+    @Expose @SerializedName("status") String status,
+
+    //  A JSON number that contains the current percentage of the Emergency Threshold
+    //  of the Service. A value of "0" specifies that there are no Incidents
+    //  affecting the threshold.
+    @Expose @SerializedName("emergencyThreshold") double emergencyThreshold,
+    @Expose @SerializedName("incidents") List<IncidentSummary> incidents) {
+
+  public ServiceStatus {
+    incidents = incidents == null ? List.of() : List.copyOf(incidents);
   }
 }