Skip to content

Commit b3ab0a0

Browse files
committed
spotmore
1 parent 928e7f4 commit b3ab0a0

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

src/main/java/com/cleanroommc/groovyscript/sandbox/CustomGroovyScriptEngine.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.codehaus.groovy.tools.gse.StringSetMap;
2323
import org.codehaus.groovy.vmplugin.VMPlugin;
2424
import org.jetbrains.annotations.ApiStatus;
25-
import org.jetbrains.annotations.NotNull;
2625
import org.jetbrains.annotations.Nullable;
2726

2827
import java.io.File;
@@ -298,7 +297,7 @@ private File findScriptFile(String scriptName) {
298297
private @Nullable Class<?> parseDynamicScript(File file, boolean isFileRelative) {
299298
if (isFileRelative) {
300299
File absoutefile = findScriptFile(file.getPath());
301-
if (absoutefile == null) {
300+
if (absoutefile == null) {
302301
throw new IllegalArgumentException("Now file was found for '" + file.getPath() + "'");
303302
}
304303
file = absoutefile;

src/main/java/com/cleanroommc/groovyscript/sandbox/RunConfig.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,11 @@ public RunConfig(JsonObject json) {
103103
List<String> packAuthors = new ArrayList<>();
104104
if (authors.isJsonPrimitive()) {
105105
// author list in a single string separated by a comma
106-
packAuthors.addAll(Arrays.stream(StringUtils.split(authors.getAsString(), ","))
107-
.map(String::trim)
108-
.filter(s -> !s.isEmpty())
109-
.collect(Collectors.toList()));
106+
packAuthors.addAll(
107+
Arrays.stream(StringUtils.split(authors.getAsString(), ","))
108+
.map(String::trim)
109+
.filter(s -> !s.isEmpty())
110+
.collect(Collectors.toList()));
110111
} else if (authors.isJsonArray()) {
111112
// authors in a json list, each entry is an author
112113
for (JsonElement author : authors.getAsJsonArray()) {

src/main/java/com/cleanroommc/groovyscript/sandbox/SandboxData.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@
2525
*/
2626
public class SandboxData {
2727

28-
private static final FileVisitOption[] FOLLOW_LINKS = {FileVisitOption.FOLLOW_LINKS};
28+
private static final FileVisitOption[] FOLLOW_LINKS = {
29+
FileVisitOption.FOLLOW_LINKS
30+
};
2931
private static final FileVisitOption[] NO_VISIT_OPTIONS = {};
3032

3133
public static final String[] GROOVY_SUFFIXES = {
@@ -147,7 +149,7 @@ static Collection<File> getSortedFilesOf(File root, Collection<String> paths, bo
147149
// if we are looking at a specific file, we don't want that to be overridden.
148150
// otherwise, we want to use the specificity based on the number of file separators.
149151
int pathSize = StringUtils.countMatches(path, separator);
150-
try (Stream<Path> stream = Files.walk(rootFile.toPath(), debug ? FOLLOW_LINKS : NO_VISIT_OPTIONS)) {
152+
try (Stream<Path> stream = Files.walk(rootFile.toPath(), debug ? FOLLOW_LINKS : NO_VISIT_OPTIONS)) {
151153
stream.filter(path1 -> isGroovyFile(path1.toString()))
152154
.map(Path::toFile)
153155
//.filter(Preprocessor::validatePreprocessors)

0 commit comments

Comments
 (0)