Small fixes

itesla · Oct 21, 2016 · 7b9651c · 7b9651c
1 parent 4309431
commit 7b9651c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/modules/src/main/java/eu/itesla_project/modules/constraints/ConstraintsModifierConfig.java b/modules/src/main/java/eu/itesla_project/modules/constraints/ConstraintsModifierConfig.java
@@ -6,8 +6,8 @@
  */
 package eu.itesla_project.modules.constraints;
 
-import java.util.Collections;
 import java.util.EnumSet;
+import java.util.Objects;
 import java.util.Set;
 
 import eu.itesla_project.commons.config.ModuleConfig;
@@ -24,7 +24,7 @@
 public class ConstraintsModifierConfig {
 
     public static final Set<LimitViolationType> DEFAULT_VIOLATION_TYPES = EnumSet.of(LimitViolationType.CURRENT);
-    public static final Set<Country> DEFAULT_COUNTRIES = Collections.emptySet();
+    public static final Set<Country> DEFAULT_COUNTRIES = EnumSet.noneOf(Country.class);
 
     private final Set<Country> countries;
     private final Set<LimitViolationType> violationsTypes;
@@ -48,8 +48,8 @@ public static ConstraintsModifierConfig load(PlatformConfig platformConfig) {
     }
 
     public ConstraintsModifierConfig(Set<Country> countries, Set<LimitViolationType> violationsTypes) {
-        this.countries = countries;
-        this.violationsTypes = violationsTypes;
+        this.countries = Objects.requireNonNull(countries);
+        this.violationsTypes = Objects.requireNonNull(violationsTypes);
     }
 
     public Set<Country> getCountries() {

diff --git a/...es/src/test/java/eu/itesla_project/modules/constraints/ConstraintsModifierConfigTest.java b/...es/src/test/java/eu/itesla_project/modules/constraints/ConstraintsModifierConfigTest.java
@@ -61,13 +61,13 @@ public void testNoConfig() throws Exception {
 
     @Test
     public void testLoadConfig() throws Exception {
-        Set<Country> countries = new HashSet(Arrays.asList(Country.FR));
+        Set<Country> countries = EnumSet.of(Country.FR);
         checkConfig(countries);
     }
 
     @Test
     public void testLoadConfigMultipleCountries() throws Exception {
-        Set<Country> countries = new HashSet(Arrays.asList(Country.values()));
+        Set<Country> countries = EnumSet.allOf(Country.class);
         checkConfig(countries);
     }