Update depends and add error handling

Author: rtm516

build.gradle

@@ -11,13 +11,13 @@ sourceCompatibility = '17'
 repositories {
 	mavenCentral()
 	maven {
-		url "https://repo.opencollab.dev/maven-releases/"
+		url "https://repo.opencollab.dev/main/"
 	}
 	maven {
-		url "https://repo.opencollab.dev/maven-snapshots/"
+		url 'https://jitpack.io'
 	}
 	maven {
-		url 'https://jitpack.io'
+		url 'https://oss.sonatype.org/content/repositories/snapshots'
 	}
 }
 
@@ -29,7 +29,7 @@ dependencies {
 	implementation 'com.github.ben-manes.caffeine:caffeine:3.1.2'
 
 	implementation 'com.nukkitx.protocol:bedrock-common:2.9.4'
-	implementation 'com.github.lucaazalim:minecraft-server-ping:bc970c5'
+	implementation 'com.github.lucaazalim:minecraft-server-ping:46ea98b7c6'
 }
 
 tasks.named('test') {

src/main/java/org/geysermc/serverpingapi/ResponseExceptionHandler.java

@@ -0,0 +1,28 @@
+package org.geysermc.serverpingapi;
+
+import org.geysermc.serverpingapi.models.ErrorResponse;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.servlet.NoHandlerFoundException;
+
+@ControllerAdvice
+public class ResponseExceptionHandler {
+    @ExceptionHandler(NoHandlerFoundException.class)
+    public ResponseEntity<ErrorResponse> endpointNotFound(final NoHandlerFoundException exception) {
+        return this.error(HttpStatus.NOT_FOUND, "Endpoint not found.");
+    }
+
+    @ExceptionHandler(Exception.class)
+    public ResponseEntity<ErrorResponse> exception(final Exception exception) {
+        return this.error(HttpStatus.INTERNAL_SERVER_ERROR, exception.getMessage());
+    }
+
+    private ResponseEntity<ErrorResponse> error(final HttpStatus status, final String error) {
+        return new ResponseEntity<>(
+            new ErrorResponse(error),
+            status
+        );
+    }
+}

src/main/java/org/geysermc/serverpingapi/HealthController.java src/main/java/org/geysermc/serverpingapi/controllers/HealthController.java

@@ -1,4 +1,4 @@
-package org.geysermc.serverpingapi;
+package org.geysermc.serverpingapi.controllers;
 
 import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.web.bind.annotation.GetMapping;

src/main/java/org/geysermc/serverpingapi/PingController.java src/main/java/org/geysermc/serverpingapi/controllers/PingController.java

@@ -1,6 +1,11 @@
-package org.geysermc.serverpingapi;
+package org.geysermc.serverpingapi.controllers;
 
 import jakarta.servlet.http.HttpServletRequest;
+import org.geysermc.serverpingapi.services.PingService;
+import org.geysermc.serverpingapi.models.CacheData;
+import org.geysermc.serverpingapi.models.PingCached;
+import org.geysermc.serverpingapi.models.PingResponse;
+import org.geysermc.serverpingapi.models.QueryData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

src/main/java/org/geysermc/serverpingapi/CacheData.java src/main/java/org/geysermc/serverpingapi/models/CacheData.java

@@ -1,4 +1,4 @@
-package org.geysermc.serverpingapi;
+package org.geysermc.serverpingapi.models;
 
 import java.time.Instant;
 

src/main/java/org/geysermc/serverpingapi/models/ErrorResponse.java

@@ -0,0 +1,4 @@
+package org.geysermc.serverpingapi.models;
+
+public record ErrorResponse(String error) {
+}

src/main/java/org/geysermc/serverpingapi/PingCached.java src/main/java/org/geysermc/serverpingapi/models/PingCached.java

@@ -1,4 +1,4 @@
-package org.geysermc.serverpingapi;
+package org.geysermc.serverpingapi.models;
 
 import java.time.Instant;
 

src/main/java/org/geysermc/serverpingapi/PingData.java src/main/java/org/geysermc/serverpingapi/models/PingData.java

@@ -1,4 +1,4 @@
-package org.geysermc.serverpingapi;
+package org.geysermc.serverpingapi.models;
 
 import com.nukkitx.protocol.bedrock.BedrockPong;
 

src/main/java/org/geysermc/serverpingapi/PingDataCached.java src/main/java/org/geysermc/serverpingapi/models/PingDataCached.java

@@ -1,4 +1,4 @@
-package org.geysermc.serverpingapi;
+package org.geysermc.serverpingapi.models;
 
 import java.time.Instant;
 

src/main/java/org/geysermc/serverpingapi/PingResponse.java src/main/java/org/geysermc/serverpingapi/models/PingResponse.java

@@ -1,4 +1,4 @@
-package org.geysermc.serverpingapi;
+package org.geysermc.serverpingapi.models;
 
 public record PingResponse(boolean success, String message, QueryData query, PingData ping, CacheData cache) {
     public PingResponse(boolean success, String message) {

src/main/java/org/geysermc/serverpingapi/QueryData.java src/main/java/org/geysermc/serverpingapi/models/QueryData.java

@@ -1,4 +1,4 @@
-package org.geysermc.serverpingapi;
+package org.geysermc.serverpingapi.models;
 
 public record QueryData(String hostname, String ip, int port) {
 }

src/main/java/org/geysermc/serverpingapi/UnsuccessfulPingCached.java src/main/java/org/geysermc/serverpingapi/models/UnsuccessfulPingCached.java

@@ -1,4 +1,4 @@
-package org.geysermc.serverpingapi;
+package org.geysermc.serverpingapi.models;
 
 import java.time.Instant;
 

src/main/java/org/geysermc/serverpingapi/PingService.java src/main/java/org/geysermc/serverpingapi/services/PingService.java

@@ -1,9 +1,15 @@
-package org.geysermc.serverpingapi;
+package org.geysermc.serverpingapi.services;
 
 import br.com.azalim.mcserverping.MCPing;
 import br.com.azalim.mcserverping.MCPingOptions;
 import com.nukkitx.protocol.bedrock.BedrockClient;
 import com.nukkitx.protocol.bedrock.BedrockPong;
+import org.geysermc.serverpingapi.controllers.PingController;
+import org.geysermc.serverpingapi.models.PingCached;
+import org.geysermc.serverpingapi.models.PingData;
+import org.geysermc.serverpingapi.models.PingDataCached;
+import org.geysermc.serverpingapi.models.QueryData;
+import org.geysermc.serverpingapi.models.UnsuccessfulPingCached;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cache.annotation.Cacheable;
@@ -58,7 +64,6 @@ private PingData getPingInner(QueryData queryData, boolean firstPing) throws Exc
         }
     }
 
-
     private void tcpPing(String hostname, int port) {
         // TODO: Check if we can just make a connection so we dont have to do a full ping
         MCPingOptions options = MCPingOptions.builder()

src/main/resources/application.yaml

@@ -0,0 +1,11 @@
+spring:
+  mvc:
+    throw-exception-if-no-handler-found: true
+  web:
+    resources:
+      add-mappings: false
+
+server:
+  error:
+    whitelabel:
+      enabled: false

src/test/java/org/geysermc/serverpingapi/PingControllerTest.java

@@ -2,6 +2,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import org.geysermc.serverpingapi.controllers.PingController;
+import org.geysermc.serverpingapi.models.PingResponse;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;