Skip to content

Commit 5bd68e9

Browse files
prokopylprokopyl
committed
Fix checkstyle and tests
1 parent b66f7aa commit 5bd68e9

File tree

14 files changed

+164
-119
lines changed

14 files changed

+164
-119
lines changed

‎src/main/java/fr/zcraft/quartzlib/components/commands/CommandEndpoint.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
package fr.zcraft.quartzlib.components.commands;
22

33
import fr.zcraft.quartzlib.components.commands.exceptions.CommandException;
4-
import org.bukkit.command.CommandSender;
5-
64
import java.util.ArrayList;
75
import java.util.List;
6+
import org.bukkit.command.CommandSender;
87

98
class CommandEndpoint extends CommandNode {
109
private final List<CommandMethod> methods = new ArrayList<>();

‎src/main/java/fr/zcraft/quartzlib/components/commands/CommandGroup.java

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,32 @@
11
package fr.zcraft.quartzlib.components.commands;
22

33
import fr.zcraft.quartzlib.components.commands.exceptions.CommandException;
4-
import org.bukkit.command.CommandSender;
5-
64
import java.util.Arrays;
75
import java.util.HashMap;
86
import java.util.Map;
97
import java.util.function.Supplier;
8+
import org.bukkit.command.CommandSender;
109

1110
class CommandGroup extends CommandNode {
1211
private final Class<?> commandGroupClass;
1312
private final Supplier<?> classInstanceSupplier;
1413

1514
private final Map<String, CommandNode> subCommands = new HashMap<>();
1615

17-
public CommandGroup(Class<?> commandGroupClass, Supplier<?> classInstanceSupplier, String name, TypeCollection typeCollection) {
16+
public CommandGroup(Class<?> commandGroupClass, Supplier<?> classInstanceSupplier, String name,
17+
TypeCollection typeCollection) {
1818
this(commandGroupClass, classInstanceSupplier, name, typeCollection, null);
1919
}
2020

21-
public CommandGroup(Class<?> commandGroupClass, Supplier<?> classInstanceSupplier, String name, TypeCollection typeCollection, CommandGroup parent) {
21+
public CommandGroup(Class<?> commandGroupClass, Supplier<?> classInstanceSupplier, String name,
22+
TypeCollection typeCollection, CommandGroup parent) {
2223
super(name, parent);
2324
this.commandGroupClass = commandGroupClass;
2425
this.classInstanceSupplier = classInstanceSupplier;
2526
DiscoveryUtils.getCommandMethods(commandGroupClass, typeCollection).forEach(this::addMethod);
2627
}
2728

28-
public Iterable<CommandNode> getSubCommands () {
29+
public Iterable<CommandNode> getSubCommands() {
2930
return this.subCommands.values();
3031
}
3132

‎src/main/java/fr/zcraft/quartzlib/components/commands/CommandManager.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
package fr.zcraft.quartzlib.components.commands;
22

33
import fr.zcraft.quartzlib.components.commands.exceptions.CommandException;
4-
import org.bukkit.command.CommandSender;
5-
64
import java.util.HashMap;
75
import java.util.Map;
86
import java.util.function.Supplier;
7+
import org.bukkit.command.CommandSender;
98

109
public class CommandManager {
1110
private final Map<String, CommandNode> rootCommands = new HashMap<>();

‎src/main/java/fr/zcraft/quartzlib/components/commands/CommandMethod.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@
44
import fr.zcraft.quartzlib.components.commands.exceptions.ArgumentParseException;
55
import fr.zcraft.quartzlib.components.commands.exceptions.CommandException;
66
import fr.zcraft.quartzlib.components.commands.exceptions.InvalidSenderException;
7-
import org.bukkit.command.CommandSender;
8-
97
import java.lang.reflect.InvocationTargetException;
108
import java.lang.reflect.Method;
119
import java.lang.reflect.Parameter;
1210
import java.util.ArrayList;
1311
import java.util.List;
12+
import org.bukkit.command.CommandSender;
1413

1514
class CommandMethod {
1615
private final Method method;
@@ -34,7 +33,7 @@ class CommandMethod {
3433
}
3534
}
3635

37-
this.arguments = arguments.toArray(new CommandMethodArgument[]{});
36+
this.arguments = arguments.toArray(new CommandMethodArgument[] {});
3837
this.parameterCount = parameters.length;
3938
}
4039

@@ -51,7 +50,8 @@ public void run(Object target, CommandSender sender, String[] args) throws Comma
5150
}
5251
}
5352

54-
private Object[] parseArguments(CommandSender sender, String[] args) throws ArgumentParseException, InvalidSenderException {
53+
private Object[] parseArguments(CommandSender sender, String[] args)
54+
throws ArgumentParseException, InvalidSenderException {
5555
Object[] parsed = new Object[parameterCount];
5656

5757
for (int i = 0; i < arguments.length; i++) {

‎src/main/java/fr/zcraft/quartzlib/components/commands/CommandMethodArgument.java

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package fr.zcraft.quartzlib.components.commands;
22

33
import fr.zcraft.quartzlib.components.commands.exceptions.ArgumentParseException;
4-
54
import java.lang.reflect.Parameter;
65

76
public class CommandMethodArgument {

‎src/main/java/fr/zcraft/quartzlib/components/commands/CommandMethodSenderArgument.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package fr.zcraft.quartzlib.components.commands;
22

3-
import fr.zcraft.quartzlib.components.commands.exceptions.ArgumentParseException;
43
import fr.zcraft.quartzlib.components.commands.exceptions.InvalidSenderException;
5-
import org.bukkit.command.CommandSender;
6-
74
import java.lang.reflect.Parameter;
5+
import org.bukkit.command.CommandSender;
86

97
public class CommandMethodSenderArgument {
108
private final Parameter parameter;

‎src/main/java/fr/zcraft/quartzlib/components/commands/DiscoveryUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public static Stream<CommandMethod> getCommandMethods(Class<?> commandGroupClass
1515
.map((Method method) -> new CommandMethod(method, typeCollection));
1616
}
1717

18-
public static Supplier<?> getClassConstructorSupplier (Class<?> commandGroupClass) {
18+
public static Supplier<?> getClassConstructorSupplier(Class<?> commandGroupClass) {
1919
Constructor<?> constructor = commandGroupClass.getDeclaredConstructors()[0];
2020
return () -> {
2121
try {

‎src/main/java/fr/zcraft/quartzlib/components/commands/TypeCollection.java

+18-11
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@
33
import fr.zcraft.quartzlib.components.commands.arguments.generic.EnumArgumentType;
44
import fr.zcraft.quartzlib.components.commands.arguments.primitive.IntegerArgumentType;
55
import fr.zcraft.quartzlib.components.commands.senders.GenericCommandSender;
6-
7-
import java.util.*;
6+
import java.util.ArrayList;
7+
import java.util.HashMap;
8+
import java.util.List;
9+
import java.util.Map;
10+
import java.util.Optional;
811

912
class TypeCollection {
1013
private final Map<Class<?>, ArgumentTypeWrapper<?>> argumentTypeMap = new HashMap<>();
@@ -17,17 +20,15 @@ public TypeCollection() {
1720
this.registerNativeTypes();
1821
}
1922

20-
public <T> void register(ArgumentTypeWrapper<T> typeHandler)
21-
{
23+
public <T> void register(ArgumentTypeWrapper<T> typeHandler) {
2224
argumentTypeMap.put(typeHandler.getResultType(), typeHandler);
2325
}
2426

2527
public <T> void register(GenericArgumentType<T> genericArgumentType) {
2628
genericArgumentTypes.add(genericArgumentType);
2729
}
2830

29-
public <T> void register(SenderTypeWrapper<T> typeHandler)
30-
{
31+
public <T> void register(SenderTypeWrapper<T> typeHandler) {
3132
senderTypeMap.put(typeHandler.getResultType(), typeHandler);
3233
}
3334

@@ -37,7 +38,9 @@ public <T> void register(GenericSenderType<T> genericSenderType) {
3738

3839
public Optional<ArgumentTypeWrapper<?>> findArgumentType(Class<?> resultType) {
3940
ArgumentTypeWrapper<?> typeHandler = argumentTypeMap.get(resultType);
40-
if (typeHandler != null) return Optional.of(typeHandler);
41+
if (typeHandler != null) {
42+
return Optional.of(typeHandler);
43+
}
4144
return this.findGenericArgumentType(resultType);
4245
}
4346

@@ -46,14 +49,15 @@ private <T> Optional<ArgumentTypeWrapper<?>> findGenericArgumentType(Class<T> re
4649
Optional<? extends ArgumentType<?>> matchingArgumentType = t.getMatchingArgumentType(resultType);
4750

4851
if (matchingArgumentType.isPresent()) {
49-
ArgumentTypeWrapper<?> typeHandler = new ArgumentTypeWrapper<>(resultType, (ArgumentType<T>) matchingArgumentType.get());
52+
ArgumentTypeWrapper<?> typeHandler =
53+
new ArgumentTypeWrapper<>(resultType, (ArgumentType<T>) matchingArgumentType.get());
5054
return Optional.of(typeHandler);
5155
}
5256
}
5357
return Optional.empty();
5458
}
5559

56-
private void registerNativeTypes () {
60+
private void registerNativeTypes() {
5761
// Primitive types
5862
register(new ArgumentTypeWrapper<>(Integer.class, new IntegerArgumentType()));
5963
register(new ArgumentTypeWrapper<>(String.class, s -> s));
@@ -68,7 +72,9 @@ private void registerNativeTypes () {
6872

6973
public Optional<SenderTypeWrapper<?>> findSenderType(Class<?> resultType) {
7074
SenderTypeWrapper<?> typeHandler = senderTypeMap.get(resultType);
71-
if (typeHandler != null) return Optional.of(typeHandler);
75+
if (typeHandler != null) {
76+
return Optional.of(typeHandler);
77+
}
7278
return this.findGenericSenderType(resultType);
7379
}
7480

@@ -77,7 +83,8 @@ private <T> Optional<SenderTypeWrapper<?>> findGenericSenderType(Class<T> result
7783
Optional<? extends SenderType<?>> matchingSenderType = t.getMatchingSenderType(resultType);
7884

7985
if (matchingSenderType.isPresent()) {
80-
SenderTypeWrapper<?> typeHandler = new SenderTypeWrapper<>(resultType, (SenderType<T>) matchingSenderType.get());
86+
SenderTypeWrapper<?> typeHandler =
87+
new SenderTypeWrapper<>(resultType, (SenderType<T>) matchingSenderType.get());
8188
return Optional.of(typeHandler);
8289
}
8390
}

‎src/main/java/fr/zcraft/quartzlib/components/commands/arguments/generic/EnumArgumentType.java

+24-23
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,32 @@
33
import fr.zcraft.quartzlib.components.commands.ArgumentType;
44
import fr.zcraft.quartzlib.components.commands.GenericArgumentType;
55
import fr.zcraft.quartzlib.components.commands.exceptions.ArgumentParseException;
6-
76
import java.lang.reflect.Modifier;
87
import java.util.Arrays;
98
import java.util.HashMap;
109
import java.util.Map;
1110
import java.util.Optional;
1211

1312
public class EnumArgumentType implements GenericArgumentType<Enum<?>> {
13+
private static Map<String, Enum<?>> getEnumValues(Class<?> enumClass) {
14+
Map<String, Enum<?>> enumValues = new HashMap<>();
15+
16+
Arrays.stream(enumClass.getDeclaredFields())
17+
.filter(f -> Modifier.isPublic(f.getModifiers())
18+
&& Modifier.isStatic(f.getModifiers())
19+
&& enumClass.isAssignableFrom(f.getType()))
20+
.forEach(f -> {
21+
try {
22+
f.setAccessible(true);
23+
enumValues.put(f.getName().toLowerCase(), (Enum<?>) f.get(null));
24+
} catch (IllegalAccessException e) {
25+
throw new RuntimeException(e);
26+
}
27+
});
28+
29+
return enumValues;
30+
}
31+
1432
@Override
1533
public Optional<ArgumentType<Enum<?>>> getMatchingArgumentType(Class<?> type) {
1634
if (type.isEnum()) {
@@ -19,7 +37,7 @@ public Optional<ArgumentType<Enum<?>>> getMatchingArgumentType(Class<?> type) {
1937
return Optional.empty();
2038
}
2139

22-
static private class DiscreteEnumArgumentType implements ArgumentType<Enum<?>> {
40+
private static class DiscreteEnumArgumentType implements ArgumentType<Enum<?>> {
2341
private final Map<String, Enum<?>> enumValues;
2442

2543
public DiscreteEnumArgumentType(Class<?> enumClass) {
@@ -29,31 +47,14 @@ public DiscreteEnumArgumentType(Class<?> enumClass) {
2947
@Override
3048
public Enum<?> parse(String raw) throws ArgumentParseException {
3149
Enum<?> value = enumValues.get(raw);
32-
if (value == null) throw new EnumParseException();
50+
if (value == null) {
51+
throw new EnumParseException();
52+
}
3353
return value;
3454
}
3555
}
3656

37-
static private class EnumParseException extends ArgumentParseException {
57+
private static class EnumParseException extends ArgumentParseException {
3858

3959
}
40-
41-
static private Map<String, Enum<?>> getEnumValues (Class<?> enumClass) {
42-
Map<String, Enum<?>> enumValues = new HashMap<>();
43-
44-
Arrays.stream(enumClass.getDeclaredFields())
45-
.filter(f -> Modifier.isPublic(f.getModifiers())
46-
&& Modifier.isStatic(f.getModifiers())
47-
&& enumClass.isAssignableFrom(f.getType()))
48-
.forEach(f -> {
49-
try {
50-
f.setAccessible(true);
51-
enumValues.put(f.getName().toLowerCase(), (Enum<?>)f.get(null));
52-
} catch (IllegalAccessException e) {
53-
throw new RuntimeException(e);
54-
}
55-
});
56-
57-
return enumValues;
58-
}
5960
}

‎src/main/java/fr/zcraft/quartzlib/components/commands/senders/GenericCommandSender.java

+3-5
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@
22

33
import fr.zcraft.quartzlib.components.commands.GenericSenderType;
44
import fr.zcraft.quartzlib.components.commands.SenderType;
5-
import fr.zcraft.quartzlib.components.commands.exceptions.ArgumentParseException;
65
import fr.zcraft.quartzlib.components.commands.exceptions.InvalidSenderException;
7-
import org.bukkit.command.CommandSender;
8-
96
import java.util.Optional;
7+
import org.bukkit.command.CommandSender;
108

119
public class GenericCommandSender implements GenericSenderType<CommandSender> {
1210
@Override
@@ -17,11 +15,11 @@ public Optional<SenderType<CommandSender>> getMatchingSenderType(Class<?> type)
1715
return Optional.empty();
1816
}
1917

20-
static private class InvalidSenderTypeException extends InvalidSenderException {
18+
private static class InvalidSenderTypeException extends InvalidSenderException {
2119

2220
}
2321

24-
static private class CommandSenderSubType implements SenderType<CommandSender> {
22+
private static class CommandSenderSubType implements SenderType<CommandSender> {
2523
private final Class<?> subtype;
2624

2725
private CommandSenderSubType(Class<?> subtype) {

0 commit comments

Comments
 (0)