Upgrade to javalin-4.0.0, prefer linked jar

kevinlin1 · Oct 17, 2022 · f058760 · f058760
1 parent ca47325
commit f058760
Show file tree

Hide file tree

Showing 10 changed files with 81 additions and 90 deletions.
diff --git a/.idea/artifacts/project_jar.xml b/.idea/artifacts/project_jar.xml
diff --git a/..._jackson_core_jackson_databind_2_10_3.xml → ...aries/fasterxml_jackson_core_databind.xml b/..._jackson_core_jackson_databind_2_10_3.xml → ...aries/fasterxml_jackson_core_databind.xml
diff --git a/.idea/libraries/io_javalin.xml b/.idea/libraries/io_javalin.xml
diff --git a/.idea/libraries/io_javalin_javalin_3_13_7.xml b/.idea/libraries/io_javalin_javalin_3_13_7.xml
diff --git a/..._locationtech_spatial4j_spatial4j_0_8.xml → .../libraries/org_locationtech_spatial4j.xml b/..._locationtech_spatial4j_spatial4j_0_8.xml → .../libraries/org_locationtech_spatial4j.xml
diff --git a/.idea/libraries/org_slf4j_slf4j_simple_1_7_30.xml b/.idea/libraries/org_slf4j_slf4j_simple_1_7_30.xml
diff --git a/.idea/libraries/slf4j_simple.xml b/.idea/libraries/slf4j_simple.xml
diff --git a/project.iml b/project.iml
@@ -10,9 +10,9 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="io.javalin:javalin:3.13.7" level="project" />
-    <orderEntry type="library" name="org.slf4j:slf4j-simple:1.7.30" level="project" />
-    <orderEntry type="library" name="com.fasterxml.jackson.core:jackson-databind:2.10.3" level="project" />
-    <orderEntry type="library" name="org.locationtech.spatial4j:spatial4j:0.8" level="project" />
+    <orderEntry type="library" name="org.locationtech.spatial4j" level="project" />
+    <orderEntry type="library" name="io.javalin" level="project" />
+    <orderEntry type="library" name="slf4j.simple" level="project" />
+    <orderEntry type="library" name="fasterxml.jackson.core.databind" level="project" />
   </component>
 </module>
diff --git a/src/META-INF/MANIFEST.MF b/src/META-INF/MANIFEST.MF
@@ -1,3 +1,16 @@
 Manifest-Version: 1.0
 Main-Class: huskymaps.MapServer
+Class-Path: slf4j-simple-1.7.31.jar slf4j-api-1.7.31.jar jackson-databin
+ d-2.12.4.jar jackson-annotations-2.12.4.jar jackson-core-2.12.4.jar spa
+ tial4j-0.8.jar javalin-4.0.0.RC3.jar slf4j-api-1.7.31.jar jetty-server-
+ 9.4.43.v20210629.jar javax.servlet-api-3.1.0.jar jetty-http-9.4.43.v202
+ 10629.jar jetty-util-9.4.43.v20210629.jar jetty-io-9.4.43.v20210629.jar
+  jetty-webapp-9.4.43.v20210629.jar jetty-xml-9.4.43.v20210629.jar jetty
+ -servlet-9.4.43.v20210629.jar jetty-security-9.4.43.v20210629.jar jetty
+ -util-ajax-9.4.43.v20210629.jar websocket-server-9.4.43.v20210629.jar w
+ ebsocket-common-9.4.43.v20210629.jar websocket-api-9.4.43.v20210629.jar
+  websocket-client-9.4.43.v20210629.jar jetty-client-9.4.43.v20210629.ja
+ r websocket-servlet-9.4.43.v20210629.jar kotlin-stdlib-jdk8-1.5.30.jar 
+ kotlin-stdlib-1.5.30.jar annotations-13.0.jar kotlin-stdlib-common-1.5.
+ 30.jar kotlin-stdlib-jdk7-1.5.30.jar
 
diff --git a/src/huskymaps/MapServer.java b/src/huskymaps/MapServer.java
@@ -55,7 +55,7 @@ public static void main(String[] args) throws Exception {
             config.addSinglePageRoot("/", "huskymaps/index.html");
         }).start(port());
         ConcurrentHashMap<String, BufferedImage> cache = new ConcurrentHashMap<>();
-        app.get("/map/:coordinates/:dimensions", ctx -> {
+        app.get("/map/{coordinates}/{dimensions}", ctx -> {
             String[] coordinates = ctx.pathParam("coordinates").split(",");
             Point center = pointLonLat(context, coordinates);
             int zoom = Integer.parseInt(coordinates[2]);