fix(central): set Peer#wgEndpointPort to Integer to allow nullable values and integrate with MySQL NULL value

2 files changed, 8 insertions, 9 deletions

diff --git a/central/src/main/java/moe/yuuta/dn42peering/manage/ManageHandler.java b/central/src/main/java/moe/yuuta/dn42peering/manage/ManageHandler.java
index 4637eb2..ad28729 100644
--- a/central/src/main/java/moe/yuuta/dn42peering/manage/ManageHandler.java
+++ b/central/src/main/java/moe/yuuta/dn42peering/manage/ManageHandler.java
@@ -685,7 +685,7 @@ public class ManageHandler implements ISubRouter {
                             }
                         }
 
-                        int wgEndpointPort = -1;
+                        Integer wgEndpointPort = null;
                         if (form.containsKey("wg_endpoint_port")) {
                             if (type == Peer.VPNType.WIREGUARD) {
                                 final String rawPort = form.getString("wg_endpoint_port");
@@ -818,8 +818,7 @@ public class ManageHandler implements ISubRouter {
                                 break;
                         }
                         root.put("wgEndpoint", peer.getWgEndpoint());
-                        if(peer.getWgEndpointPort() != -1)
-                            root.put("wgEndpointPort", peer.getWgEndpointPort());
+                        root.put("wgEndpointPort", peer.getWgEndpointPort());
                         root.put("wgPubkey", peer.getWgPeerPubkey());
                         root.put("mpbgp", peer.isMpbgp());
                         root.put("node_checked", peer.getNode());
diff --git a/central/src/main/java/moe/yuuta/dn42peering/peer/Peer.java b/central/src/main/java/moe/yuuta/dn42peering/peer/Peer.java
index 505d441..e7f31fa 100644
--- a/central/src/main/java/moe/yuuta/dn42peering/peer/Peer.java
+++ b/central/src/main/java/moe/yuuta/dn42peering/peer/Peer.java
@@ -52,7 +52,7 @@ public class Peer {
 
     @Column(name = "wg_endpoint_port")
     @TemplateParameter(name = "wg_endpoint_port")
-    private int wgEndpointPort;
+    private Integer wgEndpointPort;
 
     @Column(name = "wg_self_pubkey")
     @TemplateParameter(name = "wg_self_pubkey")
@@ -90,7 +90,7 @@ public class Peer {
                 String ipv4,
                 String ipv6,
                 String wgEndpoint,
-                int wgEndpointPort,
+                Integer wgEndpointPort,
                 String wgSelfPubkey,
                 String wgSelfPrivKey,
                 String wgPeerPubkey,
@@ -139,7 +139,7 @@ public class Peer {
     public Peer(String ipv4,
                 String ipv6,
                 String wgEndpoint,
-                int wgEndpointPort,
+                Integer wgEndpointPort,
                 String wgPeerPubkey,
                 boolean mpbgp,
                 int node) {
@@ -197,7 +197,7 @@ public class Peer {
         return WGRequest.newBuilder()
                 .setId(getId())
                 .setListenPort(Integer.parseInt(calcWireGuardPort()))
-                .setEndpoint(getWgEndpoint() == null ? "" : String.format("%s:%d", getWgEndpoint(), getWgEndpointPort()))
+                .setEndpoint(getWgEndpoint() == null && getWgEndpointPort() == null ? "" : String.format("%s:%d", getWgEndpoint(), getWgEndpointPort()))
                 .setPeerPubKey(getWgPeerPubkey())
                 .setSelfPrivKey(getWgSelfPrivKey())
                 .setSelfPresharedSecret(getWgPresharedSecret())
@@ -265,11 +265,11 @@ public class Peer {
         this.wgEndpoint = wgEndpoint;
     }
 
-    public int getWgEndpointPort() {
+    public Integer getWgEndpointPort() {
         return wgEndpointPort;
     }
 
-    public void setWgEndpointPort(int wgEndpointPort) {
+    public void setWgEndpointPort(Integer wgEndpointPort) {
         this.wgEndpointPort = wgEndpointPort;
     }