Merge branch 'master' into feature/exclude-findbugs-annotations

Author: borcsokj

README.md

@@ -33,12 +33,12 @@ timely manner.
 ## Testing online
 
 You can [test this library online](http://json-schema-validator.herokuapp.com); this web site is in
-a [project of its own](https://github.com/java-json-tools/json-schema-validator-demo), which you can fork and
+a [project of its own](https://github.com/fge/json-schema-validator-demo), which you can fork and
 run by yourself.
 
 ## Versions
 
-* current stable version: **2.2.6**
+* current stable version: **2.2.10**
   ([ChangeLog](https://github.com/java-json-tools/json-schema-validator/wiki/ChangeLog_22x),
   [Javadoc](http://java-json-tools.github.io/json-schema-validator/2.2.x/index.html), [code
   samples](http://java-json-tools.github.io/json-schema-validator/2.2.x/index.html?com/github/fge/jsonschema/examples/package-summary.html)).
@@ -57,7 +57,7 @@ Gradle:
 
 ```groovy
 dependencies {
-    compile(group: "com.github.java-json-tools", name: "json-schema-validator", version: "2.2.8");
+    compile(group: "com.github.java-json-tools", name: "json-schema-validator", version: "2.2.10");
 }
 ```
 
@@ -67,7 +67,7 @@ Maven:
 <dependency>
     <groupId>com.github.java-json-tools</groupId>
     <artifactId>json-schema-validator</artifactId>
-    <version>2.2.8</version>
+    <version>2.2.10</version>
 </dependency>
 ```
 

build.gradle

@@ -25,7 +25,7 @@ apply(plugin: "idea");
 apply(plugin: "eclipse");
 
 group = "com.github.java-json-tools";
-version = "2.2.8";
+version = "2.2.10-SNAPSHOT";
 sourceCompatibility = "1.6";
 targetCompatibility = "1.6"; // defaults to sourceCompatibility
 
@@ -40,7 +40,7 @@ repositories {
  * List of dependencies
  */
 dependencies {
-    compile(group: "com.github.java-json-tools", name: "json-schema-core", version: "1.2.8") {
+    compile(group: "com.github.java-json-tools", name: "json-schema-core", version: "1.2.9") {
         exclude(group: "com.google.code.findbugs")
     };
     compile(group: "javax.mail", name: "mailapi", version: "1.4.3");

src/main/java/com/github/fge/jsonschema/format/common/RFC3339DateTimeAttribute.java

@@ -2,6 +2,8 @@
 
 import java.util.List;
 
+import com.github.fge.jsonschema.cfg.ValidationConfiguration;
+import com.github.fge.jsonschema.library.DraftV4Library;
 import org.joda.time.format.DateTimeFormatter;
 import org.joda.time.format.DateTimeFormatterBuilder;
 import org.joda.time.format.DateTimeParser;
@@ -18,6 +20,13 @@
 /**
  * A {@link DateTimeFormatter} for date and time format defined in RFC3339.  
  * @see <a href="https://tools.ietf.org/html/rfc3339#section-5.6">RFC 3339 - Section 5.6</a>
+ *
+ * This is backwards incompat with the original DateTimeAttribute.  It will become the default in the future
+ * to use it currently you need to:
+ * Library library = DraftV4Library.get().thaw()
+ *     .addFormatAttribute("date-time", RFC3339DateTimeAttribute.getInstance())
+ *     .freeze();
+ * Then follow the rest of the steps in example 8 to hook it into your flow.
  */
 public class RFC3339DateTimeAttribute extends AbstractFormatAttribute {
 

src/main/java/com/github/fge/jsonschema/library/format/CommonFormatAttributesDictionary.java

@@ -22,9 +22,9 @@
 import com.github.fge.jsonschema.core.util.Dictionary;
 import com.github.fge.jsonschema.core.util.DictionaryBuilder;
 import com.github.fge.jsonschema.format.FormatAttribute;
+import com.github.fge.jsonschema.format.common.DateTimeAttribute;
 import com.github.fge.jsonschema.format.common.EmailAttribute;
 import com.github.fge.jsonschema.format.common.IPv6Attribute;
-import com.github.fge.jsonschema.format.common.RFC3339DateTimeAttribute;
 import com.github.fge.jsonschema.format.common.RegexAttribute;
 import com.github.fge.jsonschema.format.common.URIAttribute;
 
@@ -49,7 +49,7 @@ private CommonFormatAttributesDictionary()
         FormatAttribute attribute;
 
         name = "date-time";
-        attribute = RFC3339DateTimeAttribute.getInstance();
+        attribute = DateTimeAttribute.getInstance();
         builder.addEntry(name, attribute);
 
         name = "email";

src/test/java/com/github/fge/jsonschema/format/rfc3339/DateTimeTest.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2014, Francis Galiegue (fgaliegue@gmail.com)
+ *
+ * This software is dual-licensed under:
+ *
+ * - the Lesser General Public License (LGPL) version 3.0 or, at your option, any
+ *   later version;
+ * - the Apache Software License (ASL) version 2.0.
+ *
+ * The text of this file and of both licenses is available at the root of this
+ * project or, if you have the jar distribution, in directory META-INF/, under
+ * the names LGPL-3.0.txt and ASL-2.0.txt respectively.
+ *
+ * Direct link to the sources:
+ *
+ * - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt
+ * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt
+ */
+
+package com.github.fge.jsonschema.format.rfc3339;
+
+import com.github.fge.jsonschema.core.util.Dictionary;
+import com.github.fge.jsonschema.core.util.DictionaryBuilder;
+import com.github.fge.jsonschema.format.AbstractFormatAttributeTest;
+import com.github.fge.jsonschema.format.FormatAttribute;
+import com.github.fge.jsonschema.format.common.RFC3339DateTimeAttribute;
+
+import java.io.IOException;
+import java.text.Format;
+
+public final class DateTimeTest
+    extends AbstractFormatAttributeTest
+{
+    private static final Dictionary<FormatAttribute> dict =
+        Dictionary
+            .<FormatAttribute>newBuilder()
+            .addEntry("date-time", RFC3339DateTimeAttribute.getInstance())
+            .freeze();
+
+    public DateTimeTest()
+        throws IOException
+    {
+        super(dict, "rfc3339", "date-time");
+    }
+}

src/test/resources/format/common/date-time.json

@@ -1,6 +1,6 @@
 [
     {
-        "data": "2012-12-02T13:05:00+01:00",
+        "data": "2012-12-02T13:05:00+0100",
         "valid": true
     },
     {
@@ -20,101 +20,29 @@
         "valid": true
     },
     {
-        "data": "2012-08-07T20:42:32+10:00",
-        "valid": true
-    },    
-    {
-        "data": "2012-08-07T20:42:32-05:30",
-        "valid": true
-    },
-    {
-        "data": "201202030",
-        "valid": false,
-        "message": "err.format.invalidDate",
-        "msgData": {
-            "value": "201202030",
-            "expected": [ "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,12}((+|-)HH:mm|Z)" ]
-        },
-        "msgParams": [ "value", "expected" ]
-    },
-    {
-        "data": "2012-12-02T13:05:00+0100",
-        "valid": false,
-        "message": "err.format.invalidDate",
-        "msgData": {
-            "value": "2012-12-02T13:05:00+0100",
-            "expected": [ "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,12}((+|-)HH:mm|Z)" ]
-        },
-        "msgParams": [ "value", "expected" ]
-    },
-    {
-        "data": "2012-12-02T13:05:00+01:30:30",
-        "valid": false,
-        "message": "err.format.invalidDate",
-        "msgData": {
-            "value": "2012-12-02T13:05:00+01:30:30",
-            "expected": [ "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,12}((+|-)HH:mm|Z)" ]
-        },
-        "msgParams": [ "value", "expected" ]
-    },
-    {
-        "data": "2012-12-02T13:05:00Z[Europe/Paris]",
-        "valid": false,
-        "message": "err.format.invalidDate",
-        "msgData": {
-            "value": "2012-12-02T13:05:00Z[Europe/Paris]",
-            "expected": [ "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,12}((+|-)HH:mm|Z)" ]
-        },
-        "msgParams": [ "value", "expected" ]
-    }, 
-    {
-        "data": "2012-12-02T13:05:00+10:00Z",
-        "valid": false,
-        "message": "err.format.invalidDate",
-        "msgData": {
-            "value": "2012-12-02T13:05:00+10:00Z",
-            "expected": [ "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,12}((+|-)HH:mm|Z)" ]
-        },
-        "msgParams": [ "value", "expected" ]
-    },
-    {
-        "data": "2012-12-02T13:05:00America/New_York",
+        "data": "2012-02-30T00:00:00+0000",
         "valid": false,
         "message": "err.format.invalidDate",
         "msgData": {
-            "value": "2012-12-02T13:05:00America/New_York",
-            "expected": [ "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,12}((+|-)HH:mm|Z)" ]
+            "value": "2012-02-30T00:00:00+0000",
+            "expected": [ "yyyy-MM-dd'T'HH:mm:ssZ", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,12}Z" ]
         },
         "msgParams": [ "value", "expected" ]
     },
     {
-        "data": "2012-12-02T13:05:00[America/New_York]",
-        "valid": false,
-        "message": "err.format.invalidDate",
-        "msgData": {
-            "value": "2012-12-02T13:05:00[America/New_York]",
-            "expected": [ "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,12}((+|-)HH:mm|Z)" ]
-        },
-        "msgParams": [ "value", "expected" ]
-    },
-    {
-        "data": "2012-12-02T13:05:00.123456",
+        "data": "201202030",
         "valid": false,
         "message": "err.format.invalidDate",
         "msgData": {
-            "value": "2012-12-02T13:05:00.123456",
-            "expected": [ "yyyy-MM-dd'T'HH:mm:ss((+|-)HH:mm|Z)", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,12}((+|-)HH:mm|Z)" ]
+            "value": "201202030",
+            "expected": [ "yyyy-MM-dd'T'HH:mm:ssZ", "yyyy-MM-dd'T'HH:mm:ss.[0-9]{1,12}Z" ]
         },
         "msgParams": [ "value", "expected" ]
     },
     {
       "data": "2012-08-07T20:42:32.1234Z",
       "valid": true
     },
-    {
-      "data": "2012-08-07T20:42:32.1234+05:00",
-      "valid": true
-    },
     {
       "data": "2012-08-07T20:42:32.12345Z",
       "valid": true
@@ -131,6 +59,10 @@
       "data": "2012-08-07T20:42:32.12345678Z",
       "valid": true
     },
+    {
+      "data": "2012-08-07T20:42:32.12345678Z",
+      "valid": true
+    },
     {
       "data": "2012-08-07T20:42:32.123456789Z",
       "valid": true
@@ -146,9 +78,5 @@
     {
       "data": "2012-08-07T20:42:32.123456789012Z",
       "valid": true
-    },
-    {
-      "data": "2012-08-07T20:42:32.123456789012+05:00",
-      "valid": true
     }
 ]