implemented ipv4 and ipv6 support, changed signature of FormatValidator#validate() , added guava dependency

Author: erosb

core/pom.xml

@@ -75,11 +75,16 @@
     </plugins>
   </build>
   <dependencies>
-	 <dependency>
-		<groupId>org.json</groupId>
-		<artifactId>json</artifactId>
-		<version>20160212</version>
-	</dependency>
+    <dependency>
+      <groupId>org.json</groupId>
+      <artifactId>json</artifactId>
+      <version>20160212</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>19.0</version>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -90,6 +95,7 @@
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
       <version>1.10.19</version>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 </project>

core/src/main/java/org/everit/json/schema/FormatValidator.java

@@ -1,5 +1,7 @@
 package org.everit.json.schema;
 
+import java.util.Optional;
+
 import org.everit.json.schema.internal.DefaultFormatValidator;
 
 @FunctionalInterface
@@ -8,11 +10,10 @@ public interface FormatValidator {
   /**
    * No-operation implementation (never throws {@link ValidationException}).
    */
-  public static final FormatValidator NONE = (subject, format) -> {
-  };
+  public static final FormatValidator NONE = (subject, format) -> Optional.empty();
 
   public static FormatValidator DEFAULT = new DefaultFormatValidator();
 
-  void validate(String subject, Format format);
+  Optional<String> validate(String subject, Format format);
 
 }

core/src/main/java/org/everit/json/schema/internal/DefaultFormatValidator.java

@@ -1,14 +1,46 @@
 package org.everit.json.schema.internal;
 
+import java.net.InetAddress;
+import java.util.Objects;
+import java.util.Optional;
+
 import org.everit.json.schema.Format;
 import org.everit.json.schema.FormatValidator;
 
+import com.google.common.net.InetAddresses;
+
 public class DefaultFormatValidator implements FormatValidator {
 
-  @Override
-  public void validate(String subject, Format format) {
-    // TODO Auto-generated method stub
+  private static final int IPV4_LENGTH = 4;
+
+  private static final int IPV6_LENGTH = 16;
 
+  private Optional<InetAddress> asInetAddress(final String subject) {
+    if (InetAddresses.isInetAddress(subject)) {
+      return Optional.of(InetAddresses.forString(subject));
+    } else {
+      return Optional.empty();
+    }
   }
 
+  private Optional<String> checkIpAddress(final String subject, final int expectedLength,
+      final String failureFormat) {
+    return asInetAddress(subject)
+        .filter(addr -> addr.getAddress().length == expectedLength)
+        .map(addr -> Optional.<String> empty())
+        .orElse(Optional.of(String.format(failureFormat, subject)));
+  }
+
+  @Override
+  public Optional<String> validate(final String subject, final Format format) {
+    Objects.requireNonNull(format, "format cannot be null");
+    switch (format) {
+      case IPV4:
+        return checkIpAddress(subject, IPV4_LENGTH, "[%s] is not a valid ipv4 address");
+      case IPV6:
+        return checkIpAddress(subject, IPV6_LENGTH, "[%s] is not a valid ipv6 address");
+      default:
+        throw new IllegalArgumentException("unsupported format: " + format);
+    }
+  }
 }

core/src/test/java/org/everit/json/schema/internal/DefaultFormatValidatorTest.java

@@ -0,0 +1,64 @@
+package org.everit.json.schema.internal;
+
+import java.util.Optional;
+
+import org.everit.json.schema.Format;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class DefaultFormatValidatorTest {
+
+  private static final String THERE_IS_NO_PLACE_LIKE = "127.0.0.1";
+
+  private static final String IPV6_ADDR = "2001:db8:85a3:0:0:8a2e:370:7334";
+
+  private void assertFailure(final String subject, final Format format, final String expectedFailure) {
+    Optional<String> opt = new DefaultFormatValidator().validate(subject, format);
+    Assert.assertNotNull("the optional is not null", opt);
+    Assert.assertTrue("failure exists", opt.isPresent());
+    Assert.assertEquals(expectedFailure, opt.get());
+  }
+
+  private void assertSuccess(final String subject, final Format format) {
+    Optional<String> opt = new DefaultFormatValidator().validate(subject, format);
+    Assert.assertNotNull("the optional is not null", opt);
+    Assert.assertFalse("failure not exist", opt.isPresent());
+  }
+
+  @Test
+  public void ipv4Failure() {
+    assertFailure("asd", Format.IPV4, "[asd] is not a valid ipv4 address");
+  }
+
+  @Test
+  public void ipv4LengthFailure() {
+    assertFailure(IPV6_ADDR, Format.IPV4,
+        "[2001:db8:85a3:0:0:8a2e:370:7334] is not a valid ipv4 address");
+  }
+
+  @Test
+  public void ipv4Success() {
+    assertSuccess(THERE_IS_NO_PLACE_LIKE, Format.IPV4);
+  }
+
+  @Test
+  public void ipv6Failure() {
+    assertFailure("asd", Format.IPV6, "[asd] is not a valid ipv6 address");
+  }
+
+  @Test
+  public void ipv6LengthFailure() {
+    assertFailure(THERE_IS_NO_PLACE_LIKE, Format.IPV6, "[127.0.0.1] is not a valid ipv6 address");
+  }
+
+  @Test
+  public void ipv6Success() {
+    assertSuccess(IPV6_ADDR, Format.IPV6);
+  }
+
+  @Test(expected = NullPointerException.class)
+  public void nullFormat() {
+    new DefaultFormatValidator().validate("asd", null);
+  }
+
+}