fix: Fly and gradle build issues

* fix: Fixed compile issues and gradle configuration

* fix: Fixed fly json warning

* fix: Added missing Javalin dependency

* fix: Updated word-wrap

* fix: Added descriptive warning for failed database connections.

Author: ShrimpCryptid

backend/build.gradle

@@ -17,44 +17,42 @@ plugins {
 }
 
 repositories {
-    // Use jcenter for resolving your dependencies.
-    // You can declare any Maven/Ivy/file repository here.
-    jcenter()
+    mavenCentral()
 }
 
 dependencies {
     // This dependency is found on compile classpath of this component and consumers.
     implementation 'com.google.guava:guava:27.0.1-jre'
 
     // Javalin is a server/networking library for Java.
-    compile 'io.javalin:javalin:5.6.1'
-    compile 'org.slf4j:slf4j-simple:1.7.30'
-    compile 'org.json:json:20190722'
-    compile 'com.j2html:j2html:1.4.0'
-    compile 'com.fasterxml.jackson.core:jackson-databind:2.10.1'
+    implementation 'io.javalin:javalin:5.6.1'
+    implementation 'io.javalin:javalin-bundle:5.6.1'
+    implementation 'org.slf4j:slf4j-simple:1.7.30'
+    implementation 'org.json:json:20190722'
+    implementation 'com.j2html:j2html:1.4.0'
+    implementation 'com.fasterxml.jackson.core:jackson-databind:2.10.1'
 
     // PostgresSQL driver
-    compile 'org.postgresql:postgresql:42.2.5'
+    implementation 'org.postgresql:postgresql:42.2.5'
 
     // Apache Commons Lang
-    compile 'org.apache.commons:commons-lang3:3.0'
+    implementation 'org.apache.commons:commons-lang3:3.0'
 
     // Use JUnit test framework
     testImplementation 'junit:junit:4.12'
-    implementation 'junit:junit:4.12'
 }
 
-jar {
-    from {
-        configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
-    }
-    manifest {
-        attributes(
-                'Class-Path': configurations.compile.collect { it.getName() }.join(' '),
-                'Main-Class': 'server.SecretHitlerServer',
-                'Implementation-Title': 'secret-hitler-online'
-        )
-    }
+tasks.named('test') {
+  useJUnitPlatform()
+}
+
+tasks.named('jar') {
+  manifest {
+    attributes(
+            'Main-Class': 'server.SecretHitlerServer',
+            'Implementation-Title': 'secret-hitler-online'
+    )
+  }
 }
 
 javadoc {

backend/fly.toml

@@ -8,14 +8,14 @@ processes = []
 [env]
 
 [build.args]
-  PORT = 8080
+  PORT = "8080"
 
 [experimental]
   allowed_public_ports = []
   auto_rollback = true
 
 [[services]]
-  http_checks = []
+  http_checks = []  
   internal_port = 8080
   processes = ["app"]
   protocol = "tcp"

backend/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
-#Sat Apr 25 14:00:58 PDT 2020
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip
+#Fri Jul 21 17:42:34 PDT 2023
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists

backend/src/main/java/server/SecretHitlerServer.java

@@ -25,8 +25,9 @@ public class SecretHitlerServer {
     // TODO: Replace this with an environment variable or environment flag
     private static boolean DEBUG = false;
     public static final int DEFAULT_PORT_NUMBER = 4040;
-
+    
     // Environmental Variable Names
+    private static final String ENV_DEBUG = "DEBUG";
     private static final String ENV_DATABASE_URL = "DATABASE_URL";
 
     // Passed to server
@@ -73,7 +74,7 @@ public class SecretHitlerServer {
 
     public static final String COMMAND_END_TERM = "end-term";
 
-    private static final String CODE_CHARACTERS = "ABCDEFGHIJKLMNOPQRSTWXYZ"; // u,v character can look ambiguous
+    private static final String CODE_CHARACTERS = "ABCDEFGHIJKLMNOPQRSTWXYZ"; // u,v characters can look ambiguous
     private static final int CODE_LENGTH = 4;
 
     private static final float UPDATE_FREQUENCY_MIN = 1;
@@ -89,7 +90,7 @@ public class SecretHitlerServer {
 
     // </editor-fold>
 
-    ////// Private Classes
+    ////// Private Methods
 
     private static int getHerokuAssignedPort() {
         if (DEBUG) {
@@ -110,11 +111,17 @@ public static void main(String[] args) {
 
         // Only initialize Javalin communication after the database has been queried.
         Javalin serverApp = Javalin.create(config -> {
-            if (DEBUG) {
-                config.enableCorsForAllOrigins();
-            } else {
-                config.enableCorsForOrigin("https://secret-hitler.online");
-            }
+            config.plugins.enableCors(cors -> {
+              if (DEBUG) {
+                cors.add(it -> {
+                  it.anyHost();
+                });
+              } else {
+                cors.add(it -> {
+                  it.allowHost("https://secret-hitler.online");
+                });
+              }
+            });
         }).start(getHerokuAssignedPort());
 
         serverApp.get("/check-login", SecretHitlerServer::checkLogin); // Checks if a login is valid.
@@ -204,7 +211,12 @@ private static Connection getDatabaseConnection() {
             if (DEBUG) {
                 databaseUri = new URI("");
             } else {
-                databaseUri = new URI(System.getenv(ENV_DATABASE_URL));
+                String envUri = System.getenv(ENV_DATABASE_URL);
+                if (envUri == null) {
+                  System.out.println("Could not connect to database: No ENV_DATABASE_URL environment variable provided.");
+                  return null;
+                }
+                databaseUri = new URI(envUri);
             }
             String username = databaseUri.getUserInfo().split(":")[0];
             String password = databaseUri.getUserInfo().split(":")[1];