Add Server#getSocketAddress

Author: JulianVennen

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 2.2.0
+
+## Added
+- `Server#getSocketAddress()` which returns an `InetSocketAddress` of the server's IP and port if the server is online
+
 # 2.1.0
 
 ## Added

README.md

@@ -13,7 +13,7 @@ If you're creating a plugin/mod that runs on an exaroton server, you can get the
 Gradle:
 ```gradle
 dependencies {
-    implementation 'com.exaroton:api:2.1.0'
+    implementation 'com.exaroton:api:2.2.0'
 }
 ```
 
@@ -22,7 +22,7 @@ Maven:
 <dependency>
   <groupId>com.exaroton</groupId>
   <artifactId>api</artifactId>
-  <version>2.1.0</version>
+  <version>2.2.0</version>
 </dependency>
 ```
 

src/main/java/com/exaroton/api/server/Server.java

@@ -12,6 +12,7 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
+import java.net.InetSocketAddress;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
@@ -243,6 +244,19 @@ public Optional<Integer> getPort() {
         return Optional.ofNullable(port);
     }
 
+    /**
+     * Returns an InetSocketAddress with the host and port of the server or an empty optional if the server is offline.
+     *
+     * @return InetSocketAddress with the host and port of the server
+     */
+    public Optional<InetSocketAddress> getSocketAddress() {
+        if (host == null || port == null) {
+            return Optional.empty();
+        }
+
+        return Optional.of(new InetSocketAddress(host, port));
+    }
+
     /**
      * Get the server software
      *

src/test/java/ServerTest.java

@@ -1,20 +1,9 @@
 import com.exaroton.api.server.*;
-import com.exaroton.api.ws.data.HeapUsage;
-import com.exaroton.api.ws.data.StatsData;
-import com.exaroton.api.ws.data.TickData;
-import com.exaroton.api.ws.subscriber.*;
-import org.junit.jupiter.api.AssertionFailureBuilder;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.List;
-import java.util.Random;
 import java.util.concurrent.*;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.function.Function;
-import java.util.stream.Collectors;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -55,6 +44,7 @@ private void checkTestServer() {
 
         assertTrue(server.getHost().isEmpty());
         assertEquals(52892, server.getPort().orElse(null));
+        assertTrue(server.getSocketAddress().isEmpty());
 
         var software = server.getSoftware();
         assertNotNull(software);

src/test/java/WebSocketTest.java

@@ -40,6 +40,13 @@ void testStartServer() throws IOException, ExecutionException, InterruptedExcept
         server.fetch().join();
 
         startServer();
+
+        assertTrue(server.getPort().isPresent());
+        assertTrue(server.getHost().isPresent());
+        assertTrue(server.getSocketAddress().isPresent());
+        assertEquals(server.getPort().get(), server.getSocketAddress().get().getPort());
+        assertEquals(server.getHost().get(), server.getSocketAddress().get().getHostString());
+
         testHeapSubscriber();
         testStatsSubscriber();
         testTickSubscriber();