Second pass

src/main/java/net/fabricmc/meta/FabricMeta.java

@@ -79,7 +79,8 @@ public static void main(String[] args) {
 		ScheduledExecutorService executorService = Executors.newScheduledThreadPool(1);
 		executorService.scheduleAtFixedRate(FabricMeta::update, 1, 1, TimeUnit.MINUTES);
 
-		WebServer.start();
+		WebServer webServer = new WebServer(() -> database);
+		webServer.createServer().start(5555);
 	}
 
 	private static void update() {

src/main/java/net/fabricmc/meta/data/DataProvider.java

@@ -16,6 +16,37 @@
 
 package net.fabricmc.meta.data;
 
+import java.util.List;
+
+import com.google.gson.JsonObject;
+
+import net.fabricmc.meta.models.BaseVersion;
+import net.fabricmc.meta.models.MavenBuildGameVersion;
+import net.fabricmc.meta.models.MavenBuildVersion;
+import net.fabricmc.meta.models.MavenVersion;
+import net.fabricmc.meta.utils.LoaderMeta;
+
 public interface DataProvider {
+	@Deprecated // TODO work to remove
 	VersionDatabase getVersionDatabase();
+
+	default List<BaseVersion> getGameVersions() {
+		return getVersionDatabase().game;
+	}
+
+	default List<MavenBuildGameVersion> getMappingVersions() {
+		return getVersionDatabase().mappings;
+	}
+
+	default List<MavenVersion> getIntermediaryVersions() {
+		return getVersionDatabase().intermediary;
+	}
+
+	default List<MavenBuildVersion> getLoaderVersions() {
+		return getVersionDatabase().getLoader();
+	}
+
+	default JsonObject getLoaderInstallerJson(String mavenNotation) {
+		return LoaderMeta.getMeta(mavenNotation);
+	}
 }

src/main/java/net/fabricmc/meta/data/VersionDatabase.java

@@ -30,13 +30,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import net.fabricmc.meta.models.BaseVersion;
+import net.fabricmc.meta.models.MavenBuildGameVersion;
+import net.fabricmc.meta.models.MavenBuildVersion;
+import net.fabricmc.meta.models.MavenUrlVersion;
+import net.fabricmc.meta.models.MavenVersion;
 import net.fabricmc.meta.utils.MinecraftLauncherMeta;
 import net.fabricmc.meta.utils.PomParser;
-import net.fabricmc.meta.web.models.BaseVersion;
-import net.fabricmc.meta.web.models.MavenBuildGameVersion;
-import net.fabricmc.meta.web.models.MavenBuildVersion;
-import net.fabricmc.meta.web.models.MavenUrlVersion;
-import net.fabricmc.meta.web.models.MavenVersion;
 
 public class VersionDatabase {
 	public static final PomParser MAPPINGS_PARSER = new PomParser(LOCAL_FABRIC_MAVEN_URL + "net/fabricmc/yarn/maven-metadata.xml");

src/main/java/net/fabricmc/meta/web/models/BaseVersion.java → src/main/java/net/fabricmc/meta/models/BaseVersion.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.meta.web.models;
+package net.fabricmc.meta.models;
 
 import java.util.function.Predicate;
 

src/main/java/net/fabricmc/meta/web/models/LoaderInfoBase.java → src/main/java/net/fabricmc/meta/models/LoaderInfoBase.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.meta.web.models;
+package net.fabricmc.meta.models;
 
 public interface LoaderInfoBase {
 	MavenBuildVersion getLoader();

src/main/java/net/fabricmc/meta/web/models/LoaderInfoV1.java → src/main/java/net/fabricmc/meta/models/LoaderInfoV1.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.meta.web.models;
+package net.fabricmc.meta.models;
 
 import com.google.gson.JsonObject;
 import org.jetbrains.annotations.Nullable;
@@ -34,7 +34,7 @@ public LoaderInfoV1(MavenBuildVersion loader, MavenBuildGameVersion mappings) {
 	}
 
 	public LoaderInfoV1 populateMeta() {
-		launcherMeta = LoaderMeta.getMeta(this);
+		launcherMeta = LoaderMeta.getMeta(getLoader().getMaven());
 		return this;
 	}
 

src/main/java/net/fabricmc/meta/web/models/LoaderInfoV2.java → src/main/java/net/fabricmc/meta/models/LoaderInfoV2.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.meta.web.models;
+package net.fabricmc.meta.models;
 
 import com.google.gson.JsonObject;
 import org.jetbrains.annotations.Nullable;
@@ -34,7 +34,7 @@ public LoaderInfoV2(MavenBuildVersion loader, MavenVersion intermediary) {
 	}
 
 	public LoaderInfoV2 populateMeta() {
-		launcherMeta = LoaderMeta.getMeta(this);
+		launcherMeta = LoaderMeta.getMeta(getLoader().getMaven());
 		return this;
 	}
 

src/main/java/net/fabricmc/meta/web/models/MavenBuildGameVersion.java → src/main/java/net/fabricmc/meta/models/MavenBuildGameVersion.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.meta.web.models;
+package net.fabricmc.meta.models;
 
 import net.fabricmc.meta.utils.YarnVersionParser;
 

src/main/java/net/fabricmc/meta/web/models/MavenBuildVersion.java → src/main/java/net/fabricmc/meta/models/MavenBuildVersion.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.meta.web.models;
+package net.fabricmc.meta.models;
 
 public class MavenBuildVersion extends MavenVersion {
 	String separator;

src/main/java/net/fabricmc/meta/web/models/MavenUrlVersion.java → src/main/java/net/fabricmc/meta/models/MavenUrlVersion.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.meta.web.models;
+package net.fabricmc.meta.models;
 
 import net.fabricmc.meta.utils.Reference;
 

src/main/java/net/fabricmc/meta/web/models/MavenVersion.java → src/main/java/net/fabricmc/meta/models/MavenVersion.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.meta.web.models;
+package net.fabricmc.meta.models;
 
 public class MavenVersion extends BaseVersion {
 	String maven;

src/main/java/net/fabricmc/meta/utils/LoaderMeta.java

@@ -22,17 +22,18 @@
 import java.io.IOException;
 import java.net.URL;
 
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
 import org.apache.commons.io.FileUtils;
-
-import net.fabricmc.meta.web.WebServer;
-import net.fabricmc.meta.web.models.LoaderInfoBase;
+import org.jetbrains.annotations.Nullable;
 
 public class LoaderMeta {
-	public static final File BASE_DIR = new File("metadata");
+	private static final File BASE_DIR = new File("metadata");
+	private static final Gson GSON = new GsonBuilder().create();
 
-	public static JsonObject getMeta(LoaderInfoBase loaderInfo) {
-		String loaderMaven = loaderInfo.getLoader().getMaven();
+	@Nullable
+	public static JsonObject getMeta(String loaderMaven) {
 		String[] split = loaderMaven.split(":");
 		String path = String.format("%s/%s/%s", split[0].replaceAll("\\.", "/"), split[1], split[2]);
 		String filename = String.format("%s-%s.json", split[1], split[2]);
@@ -51,7 +52,7 @@ public static JsonObject getMeta(LoaderInfoBase loaderInfo) {
 		}
 
 		try {
-			JsonObject jsonObject = WebServer.GSON.fromJson(new FileReader(launcherMetaFile), JsonObject.class);
+			JsonObject jsonObject = GSON.fromJson(new FileReader(launcherMetaFile), JsonObject.class);
 			return jsonObject;
 		} catch (FileNotFoundException e) {
 			e.printStackTrace();

src/main/java/net/fabricmc/meta/utils/PomParser.java

@@ -33,7 +33,7 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 
-import net.fabricmc.meta.web.models.BaseVersion;
+import net.fabricmc.meta.models.BaseVersion;
 
 public class PomParser {
 	public String path;

src/main/java/net/fabricmc/meta/web/Endpoint.java

@@ -16,17 +16,21 @@
 
 package net.fabricmc.meta.web;
 
+import java.time.Duration;
 import java.util.List;
-import java.util.function.BiFunction;
-import java.util.function.Function;
 
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import io.javalin.apibuilder.EndpointGroup;
 import io.javalin.http.ContentType;
+import io.javalin.http.Context;
 import io.javalin.http.Handler;
 
 import net.fabricmc.meta.data.DataProvider;
 
 public abstract class Endpoint {
+	private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create();
+
 	protected final DataProvider dataProvider;
 
 	protected Endpoint(DataProvider dataProvider) {
@@ -35,24 +39,67 @@ protected Endpoint(DataProvider dataProvider) {
 
 	public abstract EndpointGroup routes();
 
-	// Return a json list with no params
-	protected Handler result(Function<DataProvider, List<? extends JsonModel>> objectSupplier) {
+	protected Handler cache(Duration duration) {
 		return ctx -> {
-			List<? extends JsonModel> result = objectSupplier.apply(dataProvider);
+			ctx.header("Cache-Control", "public, max-age=" + duration.getSeconds());
+		};
+	}
 
-			ctx.contentType(ContentType.APPLICATION_JSON);
-			ctx.result(WebServer.GSON.toJson(result));
+	// Return a json list with no params
+	protected Handler result(JsonListHandler handler) {
+		return ctx -> {
+			List<? extends JsonModel> result = handler.apply(dataProvider);
+			jsonResult(ctx, result);
 		};
 	}
 
 	// Return a json list with one string param
-	protected Handler result(String key, BiFunction<DataProvider, String, List<? extends JsonModel>> objectSupplier) {
+	protected Handler result(String key, JsonListHandler1 handler) {
 		return ctx -> {
 			final String value = ctx.pathParamAsClass(key, String.class).get();
+			List<? extends JsonModel> result = handler.apply(dataProvider, value);
+			jsonResult(ctx, result);
+		};
+	}
 
-			List<? extends JsonModel> result = objectSupplier.apply(dataProvider, value);
-			ctx.contentType(ContentType.APPLICATION_JSON);
-			ctx.result(WebServer.GSON.toJson(result));
+	// Return a json list with two string params
+	protected Handler result(String key1, String key2, JsonListHandler2 handler) {
+		return ctx -> {
+			final String value1 = ctx.pathParamAsClass(key1, String.class).get();
+			final String value2 = ctx.pathParamAsClass(key2, String.class).get();
+			List<? extends JsonModel> result = handler.apply(dataProvider, value1, value2);
+			jsonResult(ctx, result);
 		};
 	}
+
+	// Return a json list with two string params
+	protected Handler result(String key1, String key2, JsonHandler2 handler) {
+		return ctx -> {
+			final String value1 = ctx.pathParamAsClass(key1, String.class).get();
+			final String value2 = ctx.pathParamAsClass(key2, String.class).get();
+			JsonModel result = handler.apply(dataProvider, value1, value2);
+			jsonResult(ctx, result);
+		};
+	}
+
+	protected void jsonResult(Context ctx, Object result) {
+		ctx.contentType(ContentType.APPLICATION_JSON);
+		ctx.result(GSON.toJson(result));
+	}
+
+	protected interface JsonListHandler {
+		List<? extends JsonModel> apply(DataProvider dataProvider);
+	}
+
+	protected interface JsonListHandler1 {
+		List<? extends JsonModel> apply(DataProvider dataProvider, String key1);
+	}
+
+	protected interface JsonListHandler2 {
+		List<? extends JsonModel> apply(DataProvider dataProvider, String key1, String key2);
+	}
+
+	protected interface JsonHandler2 {
+		JsonModel apply(DataProvider dataProvider, String key1, String key2);
+	}
 }

src/main/java/net/fabricmc/meta/web/ProfileHandler.java

@@ -35,8 +35,9 @@
 import com.google.gson.JsonObject;
 import org.apache.commons.io.IOUtils;
 
+import net.fabricmc.meta.models.LoaderInfoV2;
 import net.fabricmc.meta.utils.Reference;
-import net.fabricmc.meta.web.models.LoaderInfoV2;
+import net.fabricmc.meta.web.v2.EndpointsV2;
 
 public class ProfileHandler {
 	private static final Executor EXECUTOR = Executors.newFixedThreadPool(2);

src/main/java/net/fabricmc/meta/web/ServerBootstrap.java

@@ -41,8 +41,8 @@
 import org.apache.commons.io.FileUtils;
 
 import net.fabricmc.meta.FabricMeta;
+import net.fabricmc.meta.models.BaseVersion;
 import net.fabricmc.meta.utils.Reference;
-import net.fabricmc.meta.web.models.BaseVersion;
 
 public class ServerBootstrap {
 	private static final Path CACHE_DIR = Paths.get("metadata", "installer");

src/main/java/net/fabricmc/meta/web/WebServer.java

@@ -28,40 +28,40 @@
 import io.javalin.http.Header;
 import io.javalin.plugin.bundled.CorsPluginConfig;
 
-import net.fabricmc.meta.FabricMeta;
+import net.fabricmc.meta.data.DataProvider;
 import net.fabricmc.meta.web.v1.EndpointsV1;
+import net.fabricmc.meta.web.v2.EndpointsV2;
 
 public class WebServer {
+	@Deprecated(forRemoval = true)
 	public static Javalin javalin;
-	public static Gson GSON = new GsonBuilder().setPrettyPrinting().create();
 
-	public static Javalin create() {
-		if (javalin != null) {
-			javalin.stop();
-		}
+	private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create();
+
+	private final DataProvider dataProvider;
+	private final EndpointsV1 endpointsV1;
 
-		javalin = Javalin.create(config -> {
+	public WebServer(DataProvider dataProvider) {
+		this.dataProvider = dataProvider;
+		endpointsV1 = new EndpointsV1(dataProvider);
+	}
+
+	public Javalin createServer() {
+		Javalin javalin = Javalin.create(config -> {
 			config.plugins.enableRouteOverview("/");
 			config.showJavalinBanner = false;
 			config.plugins.enableCors(cors -> cors.add(CorsPluginConfig::anyHost));
-		});
-
-		EndpointsV1 endpointsV1 = new EndpointsV1(() -> FabricMeta.database);
-
-		javalin.routes(() -> {
+		}).routes(() -> {
 			path("v1", endpointsV1.routes());
 		});
 
+		// TODO remove this
+		WebServer.javalin = javalin;
 		EndpointsV2.setup();
 
 		return javalin;
 	}
 
-	public static void start() {
-		assert javalin == null;
-		create().start(5555);
-	}
-
 	public static <T> void jsonGet(String route, Supplier<T> supplier) {
 		javalin.get(route, ctx -> {
 			T object = supplier.get();