Skip to content

Commit 42dfc5f

Browse files
authored
Merge pull request #19 from Instancify/fix/functions-return-type
fix: return type of some functions, chore: javadoc for ScriptFunction…
2 parents 9bc7eec + 045f251 commit 42dfc5f

File tree

10 files changed

+39
-9
lines changed

10 files changed

+39
-9
lines changed

api/src/main/java/com/instancify/scriptify/api/script/function/definition/ScriptFunctionExecutor.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,17 @@
1212
*/
1313
public interface ScriptFunctionExecutor {
1414

15+
/**
16+
* Retrieves the executor method.
17+
*
18+
* @return A {@link Method}
19+
*/
1520
Method getMethod();
1621

1722
/**
1823
* Retrieves the argument definitions for this executor.
1924
*
20-
* @return a list of {@link ScriptFunctionArgumentDefinition}
25+
* @return A list of {@link ScriptFunctionArgumentDefinition}
2126
*/
2227
List<ScriptFunctionArgumentDefinition> getArguments();
2328

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ java {
1212

1313
allprojects {
1414
group = "com.instancify.scriptify"
15-
version = "1.4.1-SNAPSHOT"
15+
version = "1.4.2-SNAPSHOT"
1616
}
1717

1818
subprojects {

common/src/main/java/com/instancify/scriptify/common/script/function/CommonFunctionManager.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ public CommonFunctionManager() {
3939
this.register(new ScriptFunctionRandomLong());
4040
this.register(new ScriptFunctionRandomFloat());
4141
this.register(new ScriptFunctionRandomDouble());
42+
this.register(new ScriptFunctionRandomBoolean());
4243
this.register(new ScriptFunctionMD5());
4344
this.register(new ScriptFunctionSHA256());
4445
this.register(new ScriptFunctionExecCommand());

common/src/main/java/com/instancify/scriptify/common/script/function/impl/file/ScriptFunctionDeleteFile.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public class ScriptFunctionDeleteFile implements ScriptFunction {
2020
}
2121

2222
@ExecuteAt
23-
public Object execute(
23+
public boolean execute(
2424
@Executor Script<?> script,
2525
@Argument(name = "filePath") String filePath,
2626
@Argument(name = "recursive", required = false) Boolean recursive

common/src/main/java/com/instancify/scriptify/common/script/function/impl/file/ScriptFunctionExistsFile.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public class ScriptFunctionExistsFile implements ScriptFunction {
2020
}
2121

2222
@ExecuteAt
23-
public Object execute(
23+
public boolean execute(
2424
@Executor Script<?> script,
2525
@Argument(name = "filePath") String filePath
2626
) {

common/src/main/java/com/instancify/scriptify/common/script/function/impl/file/ScriptFunctionListFiles.java

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

1010
import java.io.File;
1111
import java.util.Arrays;
12+
import java.util.List;
1213
import java.util.Objects;
1314

1415
/**
@@ -22,7 +23,7 @@ public class ScriptFunctionListFiles implements ScriptFunction {
2223
}
2324

2425
@ExecuteAt
25-
public Object execute(
26+
public List<String> execute(
2627
@Executor Script<?> script,
2728
@Argument(name = "filePath") String filePath
2829
) {

common/src/main/java/com/instancify/scriptify/common/script/function/impl/file/ScriptFunctionMoveFile.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public class ScriptFunctionMoveFile implements ScriptFunction {
2020
}
2121

2222
@ExecuteAt
23-
public Object execute(
23+
public boolean execute(
2424
@Executor Script<?> script,
2525
@Argument(name = "original") String originalFilePath,
2626
@Argument(name = "target") String targetFilePath

common/src/main/java/com/instancify/scriptify/common/script/function/impl/file/ScriptFunctionReadFile.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class ScriptFunctionReadFile implements ScriptFunction {
2121
}
2222

2323
@ExecuteAt
24-
public Object execute(
24+
public String execute(
2525
@Executor Script<?> script,
2626
@Argument(name = "filePath") String filePath
2727
) {

common/src/main/java/com/instancify/scriptify/common/script/function/impl/file/ScriptFunctionWriteFile.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ public class ScriptFunctionWriteFile implements ScriptFunction {
2121
}
2222

2323
@ExecuteAt
24-
public Object execute(
24+
public String execute(
2525
@Executor Script<?> script,
2626
@Argument(name = "filePath") String filePath,
2727
@Argument(name = "fileContent") String fileContent
2828
) {
2929
try {
30-
return Files.writeString(script.getSecurityManager().getFileSystem().getPath(filePath), fileContent);
30+
return Files.writeString(script.getSecurityManager().getFileSystem().getPath(filePath), fileContent).toString();
3131
} catch (IOException e) {
3232
throw new RuntimeException(e);
3333

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
package com.instancify.scriptify.common.script.function.impl.random;
2+
3+
import com.instancify.scriptify.api.script.function.ScriptFunction;
4+
import com.instancify.scriptify.api.script.function.annotation.ExecuteAt;
5+
import org.jetbrains.annotations.NotNull;
6+
7+
import java.util.Random;
8+
9+
/**
10+
* Represents a function to generate random long number
11+
*/
12+
public class ScriptFunctionRandomBoolean implements ScriptFunction {
13+
14+
@Override
15+
public @NotNull String getName() {
16+
return "randomBoolean";
17+
}
18+
19+
@ExecuteAt
20+
public boolean execute() {
21+
return new Random().nextBoolean();
22+
}
23+
}

0 commit comments

Comments
 (0)