chore: misc cleanup

Author: kashike

src/main/java/io/papermc/fill/SharedConstants.java

@@ -29,6 +29,9 @@ public final class SharedConstants {
   public static final String API_V2_ROUTE_PREFIX = "/v2/";
   public static final String API_V3_ROUTE_PREFIX = "/v3/";
 
+  public static final Instant API_V1_SUNSET = LocalDate.of(2021, Month.NOVEMBER, 24)
+    .atStartOfDay(ZoneOffset.UTC)
+    .toInstant();
   public static final Instant API_V2_CUTOFF = LocalDate.of(2025, Month.DECEMBER, 31)
     .atStartOfDay(ZoneOffset.UTC)
     .toInstant();

src/main/java/io/papermc/fill/configuration/TimeConfiguration.java

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2024 PaperMC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.papermc.fill.configuration;
+
+import java.time.Clock;
+import java.time.ZoneOffset;
+import org.jspecify.annotations.NullMarked;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@NullMarked
+public class TimeConfiguration {
+  @Bean
+  public Clock clock() {
+    return Clock.system(ZoneOffset.UTC);
+  }
+}

src/main/java/io/papermc/fill/controller/Data2Controller.java

@@ -27,13 +27,15 @@
 import io.papermc.fill.exception.DownloadNotFoundException;
 import io.papermc.fill.exception.ProjectNotFoundException;
 import io.papermc.fill.exception.StorageReadException;
+import io.papermc.fill.exception.SunsetException;
 import io.papermc.fill.exception.VersionNotFoundException;
 import io.papermc.fill.model.Download;
 import io.papermc.fill.service.StorageService;
 import io.papermc.fill.util.http.Caching;
 import io.papermc.fill.util.http.Responses;
 import io.swagger.v3.oas.annotations.Hidden;
 import jakarta.validation.constraints.PositiveOrZero;
+import java.time.Clock;
 import java.time.Duration;
 import org.jspecify.annotations.NullMarked;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,19 +54,21 @@
 public class Data2Controller {
   private static final Duration CACHE_LENGTH_DOWNLOAD = Duration.ofDays(7);
 
+  private final Clock clock;
   private final ProjectRepository projects;
   private final VersionRepository versions;
   private final BuildRepository builds;
-
   private final StorageService storage;
 
   @Autowired
   public Data2Controller(
+    final Clock clock,
     final ProjectRepository projects,
     final VersionRepository versions,
     final BuildRepository builds,
     final StorageService storage
   ) {
+    this.clock = clock;
     this.projects = projects;
     this.versions = versions;
     this.builds = builds;
@@ -83,6 +87,9 @@ public ResponseEntity<?> getDownload(
     @PathVariable("download")
     final String downloadName
   ) {
+    if (this.isSunset()) {
+      throw new SunsetException();
+    }
     final ProjectEntity project = this.projects.findByKey(projectKey).orElseThrow(ProjectNotFoundException::new);
     final VersionEntity version = this.versions.findByProjectAndKey(project, versionKey).orElseThrow(VersionNotFoundException::new);
     if (version.createdAt().isAfter(SharedConstants.API_V2_CUTOFF)) {
@@ -124,4 +131,8 @@ public ResponseEntity<?> getDownload(
 
     throw new DownloadNotFoundException();
   }
+
+  private boolean isSunset() {
+    return this.clock.instant().isAfter(SharedConstants.API_V2_SUNSET);
+  }
 }

src/main/java/io/papermc/fill/controller/GraphMutationController.java

@@ -48,8 +48,9 @@
 import io.papermc.fill.model.BuildChannel;
 import io.papermc.fill.model.Java;
 import io.papermc.fill.model.Support;
-import io.papermc.fill.model.SupportStatus;
+import java.time.Clock;
 import java.time.Instant;
+import java.util.Date;
 import org.bson.types.ObjectId;
 import org.jspecify.annotations.NullMarked;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -61,18 +62,21 @@
 @Controller
 @NullMarked
 public class GraphMutationController {
+  private final Clock clock;
   private final ProjectRepository projects;
   private final FamilyRepository families;
   private final VersionRepository versions;
   private final BuildRepository builds;
 
   @Autowired
   public GraphMutationController(
+    final Clock clock,
     final ProjectRepository projects,
     final FamilyRepository families,
     final VersionRepository versions,
     final BuildRepository builds
   ) {
+    this.clock = clock;
     this.projects = projects;
     this.families = families;
     this.versions = versions;
@@ -89,9 +93,10 @@ public CreateFamilyPayload createFamily(
     if (this.families.findByProjectAndKey(project, input.key()).isPresent()) {
       throw new DuplicateFamilyException();
     }
+    final Instant createdAt = this.clock.instant();
     final FamilyEntity entity = this.families.save(FamilyEntity.create(
-      new ObjectId(),
-      Instant.now(),
+      new ObjectId(Date.from(createdAt)),
+      createdAt,
       project,
       input.key(),
       input.java()
@@ -141,14 +146,15 @@ public CreateVersionPayload createVersion(
     if (this.versions.findByProjectAndKey(project, input.key()).isPresent()) {
       throw new DuplicateVersionException();
     }
+    final Instant createdAt = this.clock.instant();
     final VersionEntity entity = this.versions.save(VersionEntity.create(
-      new ObjectId(),
-      Instant.now(),
+      new ObjectId(Date.from(createdAt)),
+      createdAt,
       project,
       family,
       input.key(),
       null,
-      new Support(SupportStatus.SUPPORTED, null),
+      Support.SUPPORTED,
       input.java()
     ));
     return new CreateVersionPayload(entity);

src/main/java/io/papermc/fill/controller/GraphQueryController.java

@@ -38,11 +38,12 @@
 import io.papermc.fill.model.BuildWithDownloadsImpl;
 import io.papermc.fill.model.Commit;
 import io.papermc.fill.model.DownloadWithUrl;
-import io.papermc.fill.model.Family;
 import io.papermc.fill.model.Java;
+import io.papermc.fill.model.Keyed;
 import io.papermc.fill.model.Project;
 import io.papermc.fill.model.Support;
 import io.papermc.fill.model.SupportStatus;
+import io.papermc.fill.model.Timestamped;
 import io.papermc.fill.model.Version;
 import io.papermc.fill.service.StorageService;
 import io.papermc.fill.util.graphql.CursorCodec;
@@ -86,7 +87,6 @@ public class GraphQueryController {
   private final FamilyRepository families;
   private final VersionRepository versions;
   private final BuildRepository builds;
-
   private final StorageService storage;
 
   @Autowired
@@ -108,7 +108,7 @@ public GraphQueryController(
   public List<ProjectEntity> getProjects() {
     return this.projects.findAll()
       .stream()
-      .sorted(Project.COMPARATOR_KEY)
+      .sorted(Keyed.KEY_ASC)
       .toList();
   }
 
@@ -140,7 +140,7 @@ public List<FamilyEntity> mapProjectFamilies(
     final ProjectEntity project
   ) {
     Stream<FamilyEntity> families = this.families.findAllByProject(project);
-    families = families.sorted(Family.COMPARATOR_CREATED_AT_REVERSE);
+    families = families.sorted(Timestamped.CREATED_AT_DESC);
     return families.toList();
   }
 

src/main/java/io/papermc/fill/controller/Meta2Controller.java

@@ -30,14 +30,14 @@
 import io.papermc.fill.exception.BuildNotFoundException;
 import io.papermc.fill.exception.FamilyNotFoundException;
 import io.papermc.fill.exception.ProjectNotFoundException;
+import io.papermc.fill.exception.SunsetException;
 import io.papermc.fill.exception.VersionNotFoundException;
 import io.papermc.fill.model.Build;
 import io.papermc.fill.model.BuildChannel;
 import io.papermc.fill.model.Commit;
 import io.papermc.fill.model.Download;
-import io.papermc.fill.model.Family;
 import io.papermc.fill.model.Keyed;
-import io.papermc.fill.model.Version;
+import io.papermc.fill.model.Timestamped;
 import io.papermc.fill.model.response.v2.BuildResponse;
 import io.papermc.fill.model.response.v2.BuildsResponse;
 import io.papermc.fill.model.response.v2.FamilyBuildsResponse;
@@ -51,6 +51,7 @@
 import io.papermc.fill.util.http.Responses;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.constraints.PositiveOrZero;
+import java.time.Clock;
 import java.time.Duration;
 import java.util.List;
 import java.util.Map;
@@ -79,21 +80,23 @@ public class Meta2Controller {
   private static final Duration CACHE_LENGTH_VERSION_BUILDS = Duration.ofMinutes(5);
   private static final Duration CACHE_LENGTH_BUILD = Duration.ofDays(7);
 
+  private final Clock clock;
   private final ApplicationApiProperties properties;
-
   private final ProjectRepository projects;
   private final FamilyRepository families;
   private final VersionRepository versions;
   private final BuildRepository builds;
 
   @Autowired
   public Meta2Controller(
+    final Clock clock,
     final ApplicationApiProperties properties,
     final ProjectRepository projects,
     final FamilyRepository families,
     final VersionRepository versions,
     final BuildRepository builds
   ) {
+    this.clock = clock;
     this.properties = properties;
     this.projects = projects;
     this.families = families;
@@ -104,6 +107,9 @@ public Meta2Controller(
   @CrossOrigin(methods = RequestMethod.GET)
   @GetMapping("/v2/projects")
   public ResponseEntity<?> getProjects() {
+    if (this.isSunset()) {
+      throw new SunsetException();
+    }
     final List<ProjectEntity> projects = this.projects.findAll();
     final ProjectsResponse response = new ProjectsResponse(Keyed.keysOf(projects));
     return Responses.ok(response, Caching.publicShared(CACHE_LENGTH_PROJECTS));
@@ -115,14 +121,17 @@ public ResponseEntity<?> getProject(
     @PathVariable("project")
     final String projectKey
   ) {
+    if (this.isSunset()) {
+      throw new SunsetException();
+    }
     final ProjectEntity project = this.projects.findByKey(projectKey).orElseThrow(ProjectNotFoundException::new);
     final List<FamilyEntity> families = this.families.findAllByProject(project)
       .filter(family -> family.createdAt().isBefore(SharedConstants.API_V2_CUTOFF))
-      .sorted(Family.COMPARATOR_CREATED_AT)
+      .sorted(Timestamped.CREATED_AT_ASC)
       .toList();
     final List<VersionEntity> versions = this.versions.findAllByProject(project)
       .filter(version -> version.createdAt().isBefore(SharedConstants.API_V2_CUTOFF))
-      .sorted(Version.COMPARATOR_CREATED_AT)
+      .sorted(Timestamped.CREATED_AT_ASC)
       .toList();
     final ProjectResponse response = new ProjectResponse(
       project.key(),
@@ -141,14 +150,17 @@ public ResponseEntity<?> getFamily(
     @PathVariable("family")
     final String familyKey
   ) {
+    if (this.isSunset()) {
+      throw new SunsetException();
+    }
     final ProjectEntity project = this.projects.findByKey(projectKey).orElseThrow(ProjectNotFoundException::new);
     final FamilyEntity family = this.families.findByProjectAndKey(project, familyKey).orElseThrow(FamilyNotFoundException::new);
     if (family.createdAt().isAfter(SharedConstants.API_V2_CUTOFF)) {
       throw new FamilyNotFoundException();
     }
     final List<VersionEntity> versions = this.versions.findAllByFamily(family)
       .filter(version -> version.createdAt().isBefore(SharedConstants.API_V2_CUTOFF))
-      .sorted(Version.COMPARATOR_CREATED_AT)
+      .sorted(Timestamped.CREATED_AT_ASC)
       .toList();
     final FamilyResponse response = new FamilyResponse(
       project.key(),
@@ -167,20 +179,23 @@ public ResponseEntity<?> getFamilyBuilds(
     @PathVariable("family")
     final String familyKey
   ) {
+    if (this.isSunset()) {
+      throw new SunsetException();
+    }
     final ProjectEntity project = this.projects.findByKey(projectKey).orElseThrow(ProjectNotFoundException::new);
     final FamilyEntity family = this.families.findByProjectAndKey(project, familyKey).orElseThrow(FamilyNotFoundException::new);
     if (family.createdAt().isAfter(SharedConstants.API_V2_CUTOFF)) {
       throw new FamilyNotFoundException();
     }
     final List<VersionEntity> versions = this.versions.findAllByFamily(family)
       .filter(version -> version.createdAt().isBefore(SharedConstants.API_V2_CUTOFF))
-      .sorted(Version.COMPARATOR_CREATED_AT)
+      .sorted(Timestamped.CREATED_AT_ASC)
       .toList();
     final Map<ObjectId, VersionEntity> versionsById = versions.stream()
       .collect(Collectors.toMap(AbstractEntity::_id, Function.identity()));
     final List<BuildEntity> builds = this.builds.findAllByVersionIn(versionsById.keySet())
       .filter(build -> build.createdAt().isBefore(SharedConstants.API_V2_CUTOFF))
-      .sorted(Build.COMPARATOR_NUMBER)
+      .sorted(Build.NUMBER_ASC)
       .toList();
     final FamilyBuildsResponse response = new FamilyBuildsResponse(
       project.key(),
@@ -208,14 +223,17 @@ public ResponseEntity<?> getVersion(
     @PathVariable("version")
     final String versionKey
   ) {
+    if (this.isSunset()) {
+      throw new SunsetException();
+    }
     final ProjectEntity project = this.projects.findByKey(projectKey).orElseThrow(ProjectNotFoundException::new);
     final VersionEntity version = this.versions.findByProjectAndKey(project, versionKey).orElseThrow(VersionNotFoundException::new);
     if (version.createdAt().isAfter(SharedConstants.API_V2_CUTOFF)) {
       throw new VersionNotFoundException();
     }
     final List<BuildEntity> builds = this.builds.findAllByVersion(version)
       .filter(build -> build.createdAt().isBefore(SharedConstants.API_V2_CUTOFF))
-      .sorted(Build.COMPARATOR_NUMBER)
+      .sorted(Build.NUMBER_ASC)
       .toList();
     final VersionResponse response = new VersionResponse(
       project.key(),
@@ -234,14 +252,17 @@ public ResponseEntity<?> getVersionBuilds(
     @PathVariable("version")
     final String versionKey
   ) {
+    if (this.isSunset()) {
+      throw new SunsetException();
+    }
     final ProjectEntity project = this.projects.findByKey(projectKey).orElseThrow(ProjectNotFoundException::new);
     final VersionEntity version = this.versions.findByProjectAndKey(project, versionKey).orElseThrow(VersionNotFoundException::new);
     if (version.createdAt().isAfter(SharedConstants.API_V2_CUTOFF)) {
       throw new VersionNotFoundException();
     }
     final List<BuildEntity> builds = this.builds.findAllByVersion(version)
       .filter(build -> build.createdAt().isBefore(SharedConstants.API_V2_CUTOFF))
-      .sorted(Build.COMPARATOR_NUMBER)
+      .sorted(Build.NUMBER_ASC)
       .toList();
     final BuildsResponse response = new BuildsResponse(
       project.key(),
@@ -270,6 +291,9 @@ public ResponseEntity<?> getVersionBuild(
     @PositiveOrZero
     final int buildNumber
   ) {
+    if (this.isSunset()) {
+      throw new SunsetException();
+    }
     final ProjectEntity project = this.projects.findByKey(projectKey).orElseThrow(ProjectNotFoundException::new);
     final VersionEntity version = this.versions.findByProjectAndKey(project, versionKey).orElseThrow(VersionNotFoundException::new);
     if (version.createdAt().isAfter(SharedConstants.API_V2_CUTOFF)) {
@@ -293,6 +317,10 @@ public ResponseEntity<?> getVersionBuild(
     return Responses.ok(response, Caching.publicShared(CACHE_LENGTH_BUILD));
   }
 
+  private boolean isSunset() {
+    return this.clock.instant().isAfter(SharedConstants.API_V2_SUNSET);
+  }
+
   private static boolean isPromoted(final Build build) {
     return build.channel() == BuildChannel.RECOMMENDED;
   }