Skip to content

Commit a76654a

Browse files
committed
fix: ensure proper handling of null scaling mode and standardize scaling mode case conversion
1 parent 92c3c64 commit a76654a

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

api/src/main/java/app/simplecloud/api/internal/group/GroupApiImpl.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
import java.util.HashMap;
1212
import java.util.List;
13+
import java.util.Locale;
1314
import java.util.Map;
1415
import java.util.concurrent.CompletableFuture;
1516

@@ -273,7 +274,7 @@ private ModelsScalingConfig convertScalingConfig(ScalingConfig config) {
273274
result.setMinServers(config.getMinServers());
274275
result.setPlayerThreshold(java.math.BigDecimal.valueOf(config.getPlayerThreshold()));
275276
if (config.getScalingMode() != null) {
276-
result.setScalingMode(config.getScalingMode().name());
277+
result.setScalingMode(ModelsScalingMode.valueOf(config.getScalingMode().name().toUpperCase(Locale.ROOT)));
277278
}
278279

279280
if (config.getScaleDown() != null) {

api/src/main/java/app/simplecloud/api/internal/group/GroupImpl.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,8 @@ private ScalingConfig convertScalingConfig(app.simplecloud.api.web.models.Models
267267
result.setMaxServers(config.getMaxServers() != null ? config.getMaxServers() : 0);
268268
result.setMinServers(config.getMinServers() != null ? config.getMinServers() : 0);
269269
result.setPlayerThreshold(config.getPlayerThreshold() != null ? config.getPlayerThreshold().doubleValue() : 0.0);
270-
String scalingModeStr = config.getScalingMode();
270+
assert config.getScalingMode() != null;
271+
String scalingModeStr = config.getScalingMode().toString();
271272
if (scalingModeStr != null) {
272273
try {
273274
result.setScalingMode(ScalingMode.valueOf(scalingModeStr));

0 commit comments

Comments
 (0)