Node: setMaintanceMode - change property name / fix function naming

mattmalec · Jan 2, 2024 · 99cfaf3 · 99cfaf3
1 parent 0ba95c4
commit 99cfaf3
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 12 deletions.
diff --git a/src/main/java/com/mattmalec/pterodactyl4j/application/entities/Node.java b/src/main/java/com/mattmalec/pterodactyl4j/application/entities/Node.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2021-2022 Matt Malec, and the Pterodactyl4J contributors
+ *    Copyright 2021-2024 Matt Malec, and the Pterodactyl4J contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -42,7 +42,16 @@ public interface Node extends ISnowflake {
 
 	boolean isBehindProxy();
 
-	boolean hasMaintanceMode();
+	boolean isInMaintenanceMode();
+
+	/**
+	 * @deprecated Use {@link #isInMaintenanceMode()} instead
+	 * @return {@code true} if the node is in maintenance mode
+	 */
+	@Deprecated
+	default boolean hasMaintanceMode() {
+		return isInMaintenanceMode();
+	}
 
 	default String getMemory() {
 		return Long.toUnsignedString(getMemoryLong());

diff --git a/src/main/java/com/mattmalec/pterodactyl4j/application/entities/impl/CreateNodeImpl.java b/src/main/java/com/mattmalec/pterodactyl4j/application/entities/impl/CreateNodeImpl.java
@@ -55,7 +55,7 @@ protected RequestBody finalizeData() {
 		json.put("daemon_listen", daemonListenPort);
 		json.put("daemon_sftp", daemonSFTPPort);
 		json.put("throttle", new JSONObject().put("enabled", throttle));
-		json.put("maintenance_mode", isInMaintenanceMode ? "1" : "0");
+		json.put("maintenance_mode", maintenanceMode ? "1" : "0");
 		return getRequestBody(json);
 	}
 }
diff --git a/src/main/java/com/mattmalec/pterodactyl4j/application/entities/impl/EditNodeImpl.java b/src/main/java/com/mattmalec/pterodactyl4j/application/entities/impl/EditNodeImpl.java
@@ -65,9 +65,7 @@ protected RequestBody finalizeData() {
 				throttle == null ? new JSONObject().put("enabled", false) : new JSONObject().put("enabled", throttle));
 		json.put(
 				"maintenance_mode",
-				isInMaintenanceMode == null
-						? (node.hasMaintanceMode() ? "1" : "0")
-						: (isInMaintenanceMode ? "1" : "0"));
+				maintenanceMode == null ? (node.isInMaintenanceMode() ? "1" : "0") : (maintenanceMode ? "1" : "0"));
 
 		return getRequestBody(json);
 	}

diff --git a/src/main/java/com/mattmalec/pterodactyl4j/application/entities/impl/NodeImpl.java b/src/main/java/com/mattmalec/pterodactyl4j/application/entities/impl/NodeImpl.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2021-2022 Matt Malec, and the Pterodactyl4J contributors
+ *    Copyright 2021-2024 Matt Malec, and the Pterodactyl4J contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -89,7 +89,7 @@ public boolean isBehindProxy() {
 	}
 
 	@Override
-	public boolean hasMaintanceMode() {
+	public boolean isInMaintenanceMode() {
 		return json.getBoolean("maintenance_mode");
 	}
 

diff --git a/src/main/java/com/mattmalec/pterodactyl4j/application/managers/NodeAction.java b/src/main/java/com/mattmalec/pterodactyl4j/application/managers/NodeAction.java
@@ -66,5 +66,5 @@ default NodeAction setDiskSpaceOverallocate(long diskSpaceOverallocate) {
 
 	NodeAction setScheme(boolean secure);
 
-	NodeAction setMaintanceMode(boolean isInMaintenanceMode);
+	NodeAction setMaintenanceMode(boolean maintenanceMode);
 }
diff --git a/src/main/java/com/mattmalec/pterodactyl4j/requests/action/AbstractNodeAction.java b/src/main/java/com/mattmalec/pterodactyl4j/requests/action/AbstractNodeAction.java
@@ -40,7 +40,7 @@ public abstract class AbstractNodeAction extends PteroActionImpl<Node> implement
 	protected String daemonListenPort;
 	protected Boolean throttle;
 	protected Boolean secure;
-	protected Boolean isInMaintenanceMode;
+	protected Boolean maintenanceMode;
 
 	public AbstractNodeAction(PteroApplicationImpl impl, Route.CompiledRoute route) {
 		super(impl.getP4J(), route, (response, request) -> new NodeImpl(response.getObject(), impl));
@@ -131,8 +131,8 @@ public NodeAction setScheme(boolean secure) {
 	}
 
 	@Override
-	public NodeAction setMaintanceMode(boolean isInMaintenanceMode) {
-		this.isInMaintenanceMode = isInMaintenanceMode;
+	public NodeAction setMaintenanceMode(boolean maintenanceMode) {
+		this.maintenanceMode = maintenanceMode;
 		return this;
 	}
 }