cleanup

Author: kashike

src/main/java/io/papermc/fill/gradle/task/PublishToFillTask.java

@@ -25,6 +25,7 @@
 import io.papermc.fill.model.Download;
 import io.papermc.fill.model.request.PublishRequest;
 import io.papermc.fill.model.response.v3.BuildResponse;
+import io.papermc.fill.model.response.v3.VersionResponse;
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
@@ -42,7 +43,6 @@
 import java.util.UUID;
 import java.util.function.Consumer;
 import javax.inject.Inject;
-import io.papermc.fill.model.response.v3.VersionResponse;
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.lib.Constants;
 import org.eclipse.jgit.revwalk.RevCommit;
@@ -99,7 +99,7 @@ private void runWithGit(final Git git) {
     final int buildId = build.getId().get();
     final Instant time = Instant.now();
 
-    final List<Commit> commits = gatherCommits(git, extension);
+    final List<Commit> commits = this.gatherCommits(git, extension);
 
     final UUID id = UUID.randomUUID();
     final List<HttpRequest> requests = new ArrayList<>();
@@ -132,7 +132,7 @@ private void runWithGit(final Git git) {
         if (extension.getApiToken().isPresent()) {
           builder.header("Authorization", extension.getApiToken().get());
         } else {
-          throw new GradleException("Api token is not present.");
+          throw new GradleException("API token is not present");
         }
 
         requests.add(builder.build());
@@ -162,10 +162,10 @@ private void runWithGit(final Git git) {
       );
 
       try {
-        final HttpRequest.Builder builder = HttpRequest.newBuilder();
-        builder.header("User-Agent", USER_AGENT);
-        builder.header("Content-Type", "application/json");
-        builder.uri(URI.create(extension.getApiUrl().get() + "/publish"));
+        final HttpRequest.Builder builder = HttpRequest.newBuilder()
+          .uri(URI.create(extension.getApiUrl().get() + "/publish"))
+          .header("Content-Type", "application/json")
+          .header("User-Agent", USER_AGENT);
         builder.POST(HttpRequest.BodyPublishers.ofString(FillPlugin.MAPPER.writeValueAsString(request)));
         if (extension.getApiToken().isPresent()) {
           builder.headers("Authorization", extension.getApiToken().get());
@@ -194,7 +194,7 @@ private List<Commit> gatherCommits(Git git, FillExtension extension) {
       final RevCommit currentCommit = revWalk.parseCommit(git.getRepository().exactRef(Constants.HEAD).getObjectId());
       revWalk.markStart(currentCommit);
 
-      final List<BuildResponse> builds = fetchLastVersionBuilds(extension);
+      final List<BuildResponse> builds = this.fetchLastVersionBuilds(extension);
       if (!builds.isEmpty()) {
         // not every build might have commits, we have to find the last one that did have some
         BuildResponse lastBuildWithCommits = null;
@@ -225,36 +225,39 @@ private List<Commit> gatherCommits(Git git, FillExtension extension) {
     return commits;
   }
 
-  private List<BuildResponse> fetchLastVersionBuilds(FillExtension extension) {
-    final VersionResponse versions = getVersions(extension);
+  private List<BuildResponse> fetchLastVersionBuilds(final FillExtension extension) {
+    final List<VersionResponse> versions = this.getVersions(extension);
     String lastVersionWithBuild = null;
-    for (final VersionResponse.VersionEntry versionEntry : versions.versions()) {
-      if (versionEntry.builds().isEmpty()) {
-        continue;
+    for (final VersionResponse version : versions) {
+      if (!version.builds().isEmpty()) {
+        lastVersionWithBuild = version.version().id();
+        break;
       }
-      lastVersionWithBuild = versionEntry.version().id();
-      break;
     }
-
     if (lastVersionWithBuild != null) {
-      return getBuilds(extension, lastVersionWithBuild);
+      return this.getBuilds(extension, lastVersionWithBuild);
     }
     return List.of();
   }
 
-  private VersionResponse getVersions(final FillExtension extension) {
-    final String url = "%s/v3/projects/%s/versions".formatted(
+  private List<VersionResponse> getVersions(final FillExtension extension) {
+    final String url = String.format(
+      "%s/v3/projects/%s/versions",
       extension.getApiUrl().get(),
       extension.getProject().get()
     );
     try {
-
-      final HttpRequest request = HttpRequest.newBuilder().uri(URI.create(url)).header("User-Agent", USER_AGENT).build();
-      HttpResponse<String> response = this.httpClient.send(request, HttpResponse.BodyHandlers.ofString());
+      final HttpRequest request = HttpRequest.newBuilder()
+        .uri(URI.create(url))
+        .header("User-Agent", USER_AGENT)
+        .build();
+      final HttpResponse<String> response = this.httpClient.send(request, HttpResponse.BodyHandlers.ofString());
       final int statusCode = response.statusCode();
       if (statusCode == 200) {
         final String json = response.body();
-        return FillPlugin.MAPPER.readValue(json, VersionResponse.class);
+        @SuppressWarnings("Convert2Diamond")
+        final TypeReference<List<VersionResponse>> type = new TypeReference<List<VersionResponse>>() {};
+        return FillPlugin.MAPPER.readValue(json, type);
       } else {
         throw new IOException("Unexpected response status: " + statusCode);
       }
@@ -264,20 +267,23 @@ private VersionResponse getVersions(final FillExtension extension) {
   }
 
   private List<BuildResponse> getBuilds(final FillExtension extension, final String version) {
-    final String url = "%s/v3/projects/%s/versions/%s/builds".formatted(
+    final String url = String.format(
+      "%s/v3/projects/%s/versions/%s/builds",
       extension.getApiUrl().get(),
       extension.getProject().get(),
       version
     );
     try {
-
-      final HttpRequest request = HttpRequest.newBuilder().uri(URI.create(url)).header("User-Agent", USER_AGENT).build();
-      HttpResponse<String> response = this.httpClient.send(request, HttpResponse.BodyHandlers.ofString());
+      final HttpRequest request = HttpRequest.newBuilder()
+        .uri(URI.create(url))
+        .header("User-Agent", USER_AGENT)
+        .build();
+      final HttpResponse<String> response = this.httpClient.send(request, HttpResponse.BodyHandlers.ofString());
       final int statusCode = response.statusCode();
       if (statusCode == 200) {
         final String json = response.body();
-        @SuppressWarnings("Convert2Diamond") final TypeReference<List<BuildResponse>> type = new TypeReference<List<BuildResponse>>() {
-        };
+        @SuppressWarnings("Convert2Diamond")
+        final TypeReference<List<BuildResponse>> type = new TypeReference<List<BuildResponse>>() {};
         return FillPlugin.MAPPER.readValue(json, type);
       } else {
         throw new IOException("Unexpected response status: " + statusCode);

src/main/java/io/papermc/fill/model/Java.java

@@ -0,0 +1,37 @@
+/*
+ * 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.model;
+
+import java.util.List;
+import org.jspecify.annotations.NullMarked;
+
+@NullMarked
+public record Java(
+  JavaVersion version,
+  JavaFlags flags
+) {
+  @NullMarked
+  public record JavaVersion(
+    int minimum
+  ) {
+  }
+
+  @NullMarked
+  public record JavaFlags(
+    List<String> recommended
+  ) {
+  }
+}

src/main/java/io/papermc/fill/model/Support.java

@@ -0,0 +1,29 @@
+/*
+ * 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.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import java.time.LocalDate;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@NullMarked
+public record Support(
+  SupportStatus status,
+  @Nullable LocalDate end
+) {
+}

src/main/java/io/papermc/fill/model/SupportStatus.java

@@ -0,0 +1,25 @@
+/*
+ * 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.model;
+
+import org.jspecify.annotations.NullMarked;
+
+@NullMarked
+public enum SupportStatus {
+  SUPPORTED,
+  DEPRECATED,
+  UNSUPPORTED,
+}

src/main/java/io/papermc/fill/model/response/v3/VersionResponse.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 PaperMC
+ * 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.
@@ -15,21 +15,21 @@
  */
 package io.papermc.fill.model.response.v3;
 
+import io.papermc.fill.model.Java;
+import io.papermc.fill.model.Support;
 import java.util.List;
+import org.jspecify.annotations.NullMarked;
 
-public record VersionResponse(List<VersionEntry> versions) {
-  public record VersionEntry(Version version, List<Integer> builds) {
-    public record Version(String id, Support support, Java java) {
-      record Support(String status) {
-      }
-
-      record Java(JavaVersion version, Flags flags) {
-        record JavaVersion(int minimum) {
-        }
-
-        record Flags(String[] recommended) {
-        }
-      }
-    }
+@NullMarked
+public record VersionResponse(
+  Version version,
+  List<Integer> builds
+) {
+  @NullMarked
+  public record Version(
+    String id,
+    Support support,
+    Java java
+  ) {
   }
 }