Skip to content
This repository was archived by the owner on Nov 3, 2022. It is now read-only.

Commit fc15017

Browse files
committed
Forgot to add a type token.
1 parent 6418cf0 commit fc15017

File tree

5 files changed

+13
-41
lines changed

5 files changed

+13
-41
lines changed

src/main/java/uk/co/drnaylor/quickstart/ModuleContainer.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,11 @@
77
import com.google.common.base.Preconditions;
88
import com.google.common.collect.Maps;
99
import com.google.common.reflect.ClassPath;
10-
import com.google.common.reflect.TypeToken;
1110
import ninja.leaping.configurate.ConfigurationNode;
1211
import ninja.leaping.configurate.loader.ConfigurationLoader;
1312
import ninja.leaping.configurate.objectmapping.ObjectMappingException;
1413
import uk.co.drnaylor.quickstart.annotations.ModuleData;
1514
import uk.co.drnaylor.quickstart.config.AbstractConfigAdapter;
16-
import uk.co.drnaylor.quickstart.config.LoadingStatusTypeSerializer;
1715
import uk.co.drnaylor.quickstart.constructors.ModuleConstructor;
1816
import uk.co.drnaylor.quickstart.constructors.SimpleModuleConstructor;
1917
import uk.co.drnaylor.quickstart.enums.ConstructionPhase;
@@ -399,7 +397,6 @@ public ModuleContainer build() throws QuickStartModuleDiscoveryException {
399397
classLoader = getClass().getClassLoader();
400398
}
401399

402-
configurationLoader.getDefaultOptions().getSerializers().registerType(TypeToken.of(LoadingStatus.class), new LoadingStatusTypeSerializer());
403400
Metadata.getStartupMessage().ifPresent(x -> Logger.getLogger("QuickStart").info(x));
404401
return new ModuleContainer(configurationLoader, classLoader, packageToScan, constructor);
405402
}

src/main/java/uk/co/drnaylor/quickstart/SystemConfig.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import uk.co.drnaylor.quickstart.enums.LoadingStatus;
1414

1515
import java.io.IOException;
16+
import java.util.HashMap;
1617
import java.util.Map;
1718

1819
/**
@@ -31,7 +32,7 @@ void attachModulesConfig(Map<String, LoadingStatus> defaults) throws IOException
3132
Preconditions.checkNotNull(defaults);
3233
Preconditions.checkState(configAdapter == null);
3334

34-
configAdapter = new ModulesConfigAdapter(defaults);
35+
configAdapter = new ModulesConfigAdapter(new HashMap<>(defaults));
3536
this.attachConfigAdapter(modulesNode, configAdapter);
3637
}
3738

src/main/java/uk/co/drnaylor/quickstart/config/LoadingStatusTypeSerializer.java

Lines changed: 0 additions & 27 deletions
This file was deleted.

src/main/java/uk/co/drnaylor/quickstart/config/ModulesConfigAdapter.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,25 @@
44
*/
55
package uk.co.drnaylor.quickstart.config;
66

7-
import com.google.common.collect.ImmutableMap;
7+
import com.google.common.collect.Maps;
88
import com.google.common.reflect.TypeToken;
99
import ninja.leaping.configurate.ConfigurationNode;
1010
import ninja.leaping.configurate.objectmapping.ObjectMappingException;
1111
import uk.co.drnaylor.quickstart.enums.LoadingStatus;
1212

1313
import java.util.HashMap;
14-
import java.util.Map;
1514

1615
/**
1716
* Configuration adapter that handles the module statuses.
1817
*/
19-
public final class ModulesConfigAdapter extends AbstractConfigAdapter<Map<String, LoadingStatus>> {
18+
public final class ModulesConfigAdapter extends AbstractConfigAdapter<HashMap<String, LoadingStatus>> {
2019

2120
public static final String modulesKey = "modules";
2221

23-
private final Map<String, LoadingStatus> defaults;
22+
private final TypeToken<HashMap<String, LoadingStatus>> tt = new TypeToken<HashMap<String, LoadingStatus>>() {};
23+
private final HashMap<String, LoadingStatus> defaults;
2424

25-
public ModulesConfigAdapter(Map<String, LoadingStatus> defaults) {
25+
public ModulesConfigAdapter(HashMap<String, LoadingStatus> defaults) {
2626
this.defaults = defaults;
2727
}
2828

@@ -33,7 +33,7 @@ protected ConfigurationNode generateDefaults(ConfigurationNode node) {
3333
}
3434

3535
@Override
36-
protected Map<String, LoadingStatus> convertFromConfigurateNode(ConfigurationNode node) {
36+
protected HashMap<String, LoadingStatus> convertFromConfigurateNode(ConfigurationNode node) {
3737
HashMap<String, LoadingStatus> value = null;
3838
try {
3939
value = node.getValue(new TypeToken<HashMap<String, LoadingStatus>>() {});
@@ -42,15 +42,15 @@ protected Map<String, LoadingStatus> convertFromConfigurateNode(ConfigurationNod
4242
}
4343

4444
if (value == null) {
45-
return ImmutableMap.copyOf(defaults);
45+
return Maps.newHashMap(defaults);
4646
}
4747

4848
return value;
4949
}
5050

5151
@Override
5252
@SuppressWarnings("unchecked")
53-
protected ConfigurationNode insertIntoConfigurateNode(Map<String, LoadingStatus> data) {
54-
return this.getNewNode().setValue(data);
53+
protected ConfigurationNode insertIntoConfigurateNode(HashMap<String, LoadingStatus> data) throws ObjectMappingException {
54+
return this.getNewNode().setValue(tt, data);
5555
}
5656
}

src/test/java/uk/co/drnaylor/quickstart/tests/tests/ModuleConfigurationAdapterTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import uk.co.drnaylor.quickstart.tests.scaffolding.FakeLoaderTests;
2020

2121
import java.lang.reflect.Constructor;
22+
import java.util.HashMap;
2223
import java.util.Map;
2324

2425
public class ModuleConfigurationAdapterTests extends FakeLoaderTests {
@@ -34,7 +35,7 @@ public void beforeTests() throws Exception {
3435
ctor.setAccessible(true);
3536
config = (SystemConfig<ConfigurationNode, ConfigurationLoader<ConfigurationNode>>) ctor.newInstance(loader);
3637

37-
Map<String, LoadingStatus> m = Maps.newHashMap();
38+
HashMap<String, LoadingStatus> m = Maps.newHashMap();
3839
m.put("d", LoadingStatus.DISABLED);
3940
m.put("e", LoadingStatus.ENABLED);
4041
m.put("f", LoadingStatus.FORCELOAD);

0 commit comments

Comments
 (0)