cleanup + test fix

Author: slisaasquatch

src/main/java/com/saasquatch/jsonschemainferrer/PrimitiveEnumCriteria.java

@@ -488,10 +488,9 @@ public void testMultipleOf() {
   @Test
   public void testEnum() {
     assertThrows(NullPointerException.class,
-        () -> PrimitiveEnumCriteria.or(PrimitiveEnumCriteria.noOp(), null));
-    assertThrows(IllegalArgumentException.class, () -> PrimitiveEnumCriteria.or());
-    assertSame(PrimitiveEnumCriteria.noOp(),
-        PrimitiveEnumCriteria.or(PrimitiveEnumCriteria.noOp()));
+        () -> EnumExtractors.chained(EnumExtractors.noOp(), null));
+    assertThrows(IllegalArgumentException.class, () -> EnumExtractors.chained());
+    assertSame(EnumExtractors.noOp(), EnumExtractors.chained(EnumExtractors.noOp()));
     final List<JsonNode> timeUnitSamples = Stream.of(TimeUnit.DAYS, TimeUnit.HOURS)
         .map(tu -> jnf.textNode(tu.name())).collect(ImmutableList.toImmutableList());
     {

src/main/java/com/saasquatch/jsonschemainferrer/PrimitiveEnumCriterion.java

@@ -27,7 +27,7 @@ public void test() {
     doTest(ExamplesPolicies::noOp);
     doTest(MultipleOfPolicies::noOp);
     doTest(MultipleOfPolicies::gcd);
-    doTest(PrimitiveEnumCriteria::noOp);
+    doTest(EnumExtractors::noOp);
   }
 
   private static void doTest(Supplier<? extends Object> supplier) {