Skip to content

Commit 875e3e8

Browse files
FllipEisFllipEis
committed
fix: persistent server api
1 parent 2fdd00d commit 875e3e8

File tree

10 files changed

+216
-29
lines changed

10 files changed

+216
-29
lines changed

‎api/src/main/java/app/simplecloud/api/internal/event/server/ServerDeletedEventImpl.java‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
package app.simplecloud.api.internal.event.server;
22

33
import app.simplecloud.api.event.server.ServerDeletedEvent;
4+
import app.simplecloud.api.internal.persistentserver.PersistentServerImpl;
45
import app.simplecloud.api.internal.server.ServerImpl;
56
import app.simplecloud.api.server.Server;
7+
import app.simplecloud.api.web.models.ModelsPersistentServerInfo;
68
import app.simplecloud.api.web.models.ModelsServerGroupInfo;
79
import app.simplecloud.api.web.models.ModelsServerSummary;
810

@@ -66,6 +68,8 @@ public Server getServer() {
6668
}
6769
}
6870

71+
ServerImpl serverImpl = new ServerImpl(summary);
72+
6973
if (delegate.hasGroupConfig() && delegate.getGroupConfig().hasBaseConfig()) {
7074
ModelsServerGroupInfo groupInfo = new ModelsServerGroupInfo();
7175
var groupConfig = delegate.getGroupConfig();
@@ -74,9 +78,18 @@ public Server getServer() {
7478
groupInfo.setName(baseConfig.getName());
7579
groupInfo.setType(convertServerTypeToString(baseConfig.getType()));
7680
summary.setServerGroup(groupInfo);
81+
} else if (delegate.hasPersistentServerConfig() && delegate.getPersistentServerConfig().hasBaseConfig()) {
82+
ModelsPersistentServerInfo persistentServerInfo = new ModelsPersistentServerInfo();
83+
var psConfig = delegate.getPersistentServerConfig();
84+
var baseConfig = psConfig.getBaseConfig();
85+
persistentServerInfo.setId(delegate.getPersistentServerId());
86+
persistentServerInfo.setName(baseConfig.getName());
87+
persistentServerInfo.setType(convertServerTypeToString(baseConfig.getType()));
88+
summary.setPersistentServerId(delegate.getPersistentServerId());
89+
serverImpl.setPersistentServer(new PersistentServerImpl(persistentServerInfo));
7790
}
7891

79-
server = new ServerImpl(summary);
92+
server = serverImpl;
8093
}
8194
return server;
8295
}

‎api/src/main/java/app/simplecloud/api/internal/event/server/ServerStartedEventImpl.java‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
package app.simplecloud.api.internal.event.server;
22

33
import app.simplecloud.api.event.server.ServerStartedEvent;
4+
import app.simplecloud.api.internal.persistentserver.PersistentServerImpl;
45
import app.simplecloud.api.internal.server.ServerImpl;
56
import app.simplecloud.api.server.Server;
7+
import app.simplecloud.api.web.models.ModelsPersistentServerInfo;
68
import app.simplecloud.api.web.models.ModelsServerGroupInfo;
79
import app.simplecloud.api.web.models.ModelsServerSummary;
810

@@ -68,6 +70,8 @@ public Server getServer() {
6870

6971
summary.setState(convertServerStateToString(delegate.getState()));
7072

73+
ServerImpl serverImpl = new ServerImpl(summary);
74+
7175
if (delegate.hasGroupConfig() && delegate.getGroupConfig().hasBaseConfig()) {
7276
ModelsServerGroupInfo groupInfo = new ModelsServerGroupInfo();
7377
var groupConfig = delegate.getGroupConfig();
@@ -76,9 +80,18 @@ public Server getServer() {
7680
groupInfo.setName(baseConfig.getName());
7781
groupInfo.setType(convertServerTypeToString(baseConfig.getType()));
7882
summary.setServerGroup(groupInfo);
83+
} else if (delegate.hasPersistentServerConfig() && delegate.getPersistentServerConfig().hasBaseConfig()) {
84+
ModelsPersistentServerInfo persistentServerInfo = new ModelsPersistentServerInfo();
85+
var psConfig = delegate.getPersistentServerConfig();
86+
var baseConfig = psConfig.getBaseConfig();
87+
persistentServerInfo.setId(delegate.getPersistentServerId());
88+
persistentServerInfo.setName(baseConfig.getName());
89+
persistentServerInfo.setType(convertServerTypeToString(baseConfig.getType()));
90+
summary.setPersistentServerId(delegate.getPersistentServerId());
91+
serverImpl.setPersistentServer(new PersistentServerImpl(persistentServerInfo));
7992
}
8093

81-
server = new ServerImpl(summary);
94+
server = serverImpl;
8295
}
8396
return server;
8497
}

‎api/src/main/java/app/simplecloud/api/internal/event/server/ServerStateChangedEventImpl.java‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
package app.simplecloud.api.internal.event.server;
22

33
import app.simplecloud.api.event.server.ServerStateChangedEvent;
4+
import app.simplecloud.api.internal.persistentserver.PersistentServerImpl;
45
import app.simplecloud.api.internal.server.ServerImpl;
56
import app.simplecloud.api.server.Server;
67
import app.simplecloud.api.server.ServerState;
8+
import app.simplecloud.api.web.models.ModelsPersistentServerInfo;
79
import app.simplecloud.api.web.models.ModelsServerGroupInfo;
810
import app.simplecloud.api.web.models.ModelsServerSummary;
911

@@ -82,6 +84,8 @@ public Server getServer() {
8284

8385
summary.setState(convertServerStateToString(delegate.getNewState()));
8486

87+
ServerImpl serverImpl = new ServerImpl(summary);
88+
8589
if (delegate.hasGroupConfig() && delegate.getGroupConfig().hasBaseConfig()) {
8690
ModelsServerGroupInfo groupInfo = new ModelsServerGroupInfo();
8791
var groupConfig = delegate.getGroupConfig();
@@ -90,9 +94,18 @@ public Server getServer() {
9094
groupInfo.setName(baseConfig.getName());
9195
groupInfo.setType(convertServerTypeToString(baseConfig.getType()));
9296
summary.setServerGroup(groupInfo);
97+
} else if (delegate.hasPersistentServerConfig() && delegate.getPersistentServerConfig().hasBaseConfig()) {
98+
ModelsPersistentServerInfo persistentServerInfo = new ModelsPersistentServerInfo();
99+
var psConfig = delegate.getPersistentServerConfig();
100+
var baseConfig = psConfig.getBaseConfig();
101+
persistentServerInfo.setId(delegate.getPersistentServerId());
102+
persistentServerInfo.setName(baseConfig.getName());
103+
persistentServerInfo.setType(convertServerTypeToString(baseConfig.getType()));
104+
summary.setPersistentServerId(delegate.getPersistentServerId());
105+
serverImpl.setPersistentServer(new PersistentServerImpl(persistentServerInfo));
93106
}
94107

95-
server = new ServerImpl(summary);
108+
server = serverImpl;
96109
}
97110
return server;
98111
}

‎api/src/main/java/app/simplecloud/api/internal/event/server/ServerStoppedEventImpl.java‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
package app.simplecloud.api.internal.event.server;
22

33
import app.simplecloud.api.event.server.ServerStoppedEvent;
4+
import app.simplecloud.api.internal.persistentserver.PersistentServerImpl;
45
import app.simplecloud.api.internal.server.ServerImpl;
56
import app.simplecloud.api.server.Server;
7+
import app.simplecloud.api.web.models.ModelsPersistentServerInfo;
68
import app.simplecloud.api.web.models.ModelsServerGroupInfo;
79
import app.simplecloud.api.web.models.ModelsServerSummary;
810
import org.jetbrains.annotations.Nullable;
@@ -67,6 +69,8 @@ public Server getServer() {
6769
}
6870
}
6971

72+
ServerImpl serverImpl = new ServerImpl(summary);
73+
7074
if (delegate.hasGroupConfig() && delegate.getGroupConfig().hasBaseConfig()) {
7175
ModelsServerGroupInfo groupInfo = new ModelsServerGroupInfo();
7276
var groupConfig = delegate.getGroupConfig();
@@ -75,9 +79,18 @@ public Server getServer() {
7579
groupInfo.setName(baseConfig.getName());
7680
groupInfo.setType(convertServerTypeToString(baseConfig.getType()));
7781
summary.setServerGroup(groupInfo);
82+
} else if (delegate.hasPersistentServerConfig() && delegate.getPersistentServerConfig().hasBaseConfig()) {
83+
ModelsPersistentServerInfo persistentServerInfo = new ModelsPersistentServerInfo();
84+
var psConfig = delegate.getPersistentServerConfig();
85+
var baseConfig = psConfig.getBaseConfig();
86+
persistentServerInfo.setId(delegate.getPersistentServerId());
87+
persistentServerInfo.setName(baseConfig.getName());
88+
persistentServerInfo.setType(convertServerTypeToString(baseConfig.getType()));
89+
summary.setPersistentServerId(delegate.getPersistentServerId());
90+
serverImpl.setPersistentServer(new PersistentServerImpl(persistentServerInfo));
7891
}
7992

80-
server = new ServerImpl(summary);
93+
server = serverImpl;
8194
}
8295
return server;
8396
}

‎api/src/main/java/app/simplecloud/api/internal/event/server/ServerUpdatedEventImpl.java‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
package app.simplecloud.api.internal.event.server;
22

33
import app.simplecloud.api.event.server.ServerUpdatedEvent;
4+
import app.simplecloud.api.internal.persistentserver.PersistentServerImpl;
45
import app.simplecloud.api.internal.server.ServerImpl;
56
import app.simplecloud.api.server.Server;
7+
import app.simplecloud.api.web.models.ModelsPersistentServerInfo;
68
import app.simplecloud.api.web.models.ModelsServerGroupInfo;
79
import app.simplecloud.api.web.models.ModelsServerSummary;
810

@@ -66,6 +68,8 @@ public Server getServer() {
6668
}
6769
}
6870

71+
ServerImpl serverImpl = new ServerImpl(summary);
72+
6973
if (delegate.hasGroupConfig() && delegate.getGroupConfig().hasBaseConfig()) {
7074
ModelsServerGroupInfo groupInfo = new ModelsServerGroupInfo();
7175
var groupConfig = delegate.getGroupConfig();
@@ -74,9 +78,18 @@ public Server getServer() {
7478
groupInfo.setName(baseConfig.getName());
7579
groupInfo.setType(convertServerTypeToString(baseConfig.getType()));
7680
summary.setServerGroup(groupInfo);
81+
} else if (delegate.hasPersistentServerConfig() && delegate.getPersistentServerConfig().hasBaseConfig()) {
82+
ModelsPersistentServerInfo persistentServerInfo = new ModelsPersistentServerInfo();
83+
var psConfig = delegate.getPersistentServerConfig();
84+
var baseConfig = psConfig.getBaseConfig();
85+
persistentServerInfo.setId(delegate.getPersistentServerId());
86+
persistentServerInfo.setName(baseConfig.getName());
87+
persistentServerInfo.setType(convertServerTypeToString(baseConfig.getType()));
88+
summary.setPersistentServerId(delegate.getPersistentServerId());
89+
serverImpl.setPersistentServer(new PersistentServerImpl(persistentServerInfo));
7790
}
7891

79-
server = new ServerImpl(summary);
92+
server = serverImpl;
8093
}
8194
return server;
8295
}

0 commit comments

Comments
 (0)