From 399726f0e19825604b9d895ccbd7879256befd7f Mon Sep 17 00:00:00 2001 From: Trevor Pering Date: Mon, 9 Aug 2021 21:40:27 -0700 Subject: [PATCH] Fix file path error --- ...om_damnhandy_handy_uri_templates_2_1_6.xml | 11 -------- ...on_schema_org_everit_json_schema_1_9_1.xml | 9 ------- ...le__com_github_java_json_tools_btf_1_3.xml | 11 ++++++++ ..._java_json_tools_jackson_coreutils_2_0.xml | 11 ++++++++ ...ools_jackson_coreutils_equivalence_1_0.xml | 11 ++++++++ ...ava_json_tools_json_schema_core_1_2_14.xml | 11 ++++++++ ...son_tools_json_schema_validator_2_2_14.xml | 11 ++++++++ ..._github_java_json_tools_msg_simple_1_2.xml | 11 ++++++++ ...thub_java_json_tools_uri_template_0_10.xml | 11 ++++++++ ...e_libphonenumber_libphonenumber_8_11_1.xml | 11 ++++++++ ...=> Gradle__com_sun_mail_mailapi_1_6_2.xml} | 6 ++--- ...mons_beanutils_commons_beanutils_1_9_2.xml | 11 -------- ..._collections_commons_collections_3_2_2.xml | 11 -------- ...ommons_digester_commons_digester_1_8_1.xml | 11 -------- ...ommons_validator_commons_validator_1_6.xml | 11 -------- .../Gradle__joda_time_joda_time_2_10_5.xml | 11 ++++++++ .../Gradle__joda_time_joda_time_2_9_4.xml | 11 -------- ...__net_sf_jopt_simple_jopt_simple_5_0_4.xml | 11 ++++++++ ... => Gradle__org_mozilla_rhino_1_7_7_2.xml} | 6 ++--- .../.idea/modules/daq-validator.validator.iml | 27 ++++++++++--------- .../google/daq/mqtt/validator/Validator.java | 8 +++--- 21 files changed, 134 insertions(+), 98 deletions(-) delete mode 100644 validator/.idea/libraries/Gradle__com_damnhandy_handy_uri_templates_2_1_6.xml delete mode 100644 validator/.idea/libraries/Gradle__com_github_everit_org_json_schema_org_everit_json_schema_1_9_1.xml create mode 100644 validator/.idea/libraries/Gradle__com_github_java_json_tools_btf_1_3.xml create mode 100644 validator/.idea/libraries/Gradle__com_github_java_json_tools_jackson_coreutils_2_0.xml create mode 100644 validator/.idea/libraries/Gradle__com_github_java_json_tools_jackson_coreutils_equivalence_1_0.xml create mode 100644 validator/.idea/libraries/Gradle__com_github_java_json_tools_json_schema_core_1_2_14.xml create mode 100644 validator/.idea/libraries/Gradle__com_github_java_json_tools_json_schema_validator_2_2_14.xml create mode 100644 validator/.idea/libraries/Gradle__com_github_java_json_tools_msg_simple_1_2.xml create mode 100644 validator/.idea/libraries/Gradle__com_github_java_json_tools_uri_template_0_10.xml create mode 100644 validator/.idea/libraries/Gradle__com_googlecode_libphonenumber_libphonenumber_8_11_1.xml rename validator/.idea/libraries/{Gradle__com_google_re2j_re2j_1_1.xml => Gradle__com_sun_mail_mailapi_1_6_2.xml} (50%) delete mode 100644 validator/.idea/libraries/Gradle__commons_beanutils_commons_beanutils_1_9_2.xml delete mode 100644 validator/.idea/libraries/Gradle__commons_collections_commons_collections_3_2_2.xml delete mode 100644 validator/.idea/libraries/Gradle__commons_digester_commons_digester_1_8_1.xml delete mode 100644 validator/.idea/libraries/Gradle__commons_validator_commons_validator_1_6.xml create mode 100644 validator/.idea/libraries/Gradle__joda_time_joda_time_2_10_5.xml delete mode 100644 validator/.idea/libraries/Gradle__joda_time_joda_time_2_9_4.xml create mode 100644 validator/.idea/libraries/Gradle__net_sf_jopt_simple_jopt_simple_5_0_4.xml rename validator/.idea/libraries/{Gradle__org_json_json_20180130.xml => Gradle__org_mozilla_rhino_1_7_7_2.xml} (50%) diff --git a/validator/.idea/libraries/Gradle__com_damnhandy_handy_uri_templates_2_1_6.xml b/validator/.idea/libraries/Gradle__com_damnhandy_handy_uri_templates_2_1_6.xml deleted file mode 100644 index 06fc55732d..0000000000 --- a/validator/.idea/libraries/Gradle__com_damnhandy_handy_uri_templates_2_1_6.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/validator/.idea/libraries/Gradle__com_github_everit_org_json_schema_org_everit_json_schema_1_9_1.xml b/validator/.idea/libraries/Gradle__com_github_everit_org_json_schema_org_everit_json_schema_1_9_1.xml deleted file mode 100644 index b593493a54..0000000000 --- a/validator/.idea/libraries/Gradle__com_github_everit_org_json_schema_org_everit_json_schema_1_9_1.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/validator/.idea/libraries/Gradle__com_github_java_json_tools_btf_1_3.xml b/validator/.idea/libraries/Gradle__com_github_java_json_tools_btf_1_3.xml new file mode 100644 index 0000000000..ae863490af --- /dev/null +++ b/validator/.idea/libraries/Gradle__com_github_java_json_tools_btf_1_3.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/validator/.idea/libraries/Gradle__com_github_java_json_tools_jackson_coreutils_2_0.xml b/validator/.idea/libraries/Gradle__com_github_java_json_tools_jackson_coreutils_2_0.xml new file mode 100644 index 0000000000..2aee87df96 --- /dev/null +++ b/validator/.idea/libraries/Gradle__com_github_java_json_tools_jackson_coreutils_2_0.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/validator/.idea/libraries/Gradle__com_github_java_json_tools_jackson_coreutils_equivalence_1_0.xml b/validator/.idea/libraries/Gradle__com_github_java_json_tools_jackson_coreutils_equivalence_1_0.xml new file mode 100644 index 0000000000..e8bdbbd47c --- /dev/null +++ b/validator/.idea/libraries/Gradle__com_github_java_json_tools_jackson_coreutils_equivalence_1_0.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/validator/.idea/libraries/Gradle__com_github_java_json_tools_json_schema_core_1_2_14.xml b/validator/.idea/libraries/Gradle__com_github_java_json_tools_json_schema_core_1_2_14.xml new file mode 100644 index 0000000000..a54415c43c --- /dev/null +++ b/validator/.idea/libraries/Gradle__com_github_java_json_tools_json_schema_core_1_2_14.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/validator/.idea/libraries/Gradle__com_github_java_json_tools_json_schema_validator_2_2_14.xml b/validator/.idea/libraries/Gradle__com_github_java_json_tools_json_schema_validator_2_2_14.xml new file mode 100644 index 0000000000..408a4a00b8 --- /dev/null +++ b/validator/.idea/libraries/Gradle__com_github_java_json_tools_json_schema_validator_2_2_14.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/validator/.idea/libraries/Gradle__com_github_java_json_tools_msg_simple_1_2.xml b/validator/.idea/libraries/Gradle__com_github_java_json_tools_msg_simple_1_2.xml new file mode 100644 index 0000000000..1808cf2cd4 --- /dev/null +++ b/validator/.idea/libraries/Gradle__com_github_java_json_tools_msg_simple_1_2.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/validator/.idea/libraries/Gradle__com_github_java_json_tools_uri_template_0_10.xml b/validator/.idea/libraries/Gradle__com_github_java_json_tools_uri_template_0_10.xml new file mode 100644 index 0000000000..309571cbc2 --- /dev/null +++ b/validator/.idea/libraries/Gradle__com_github_java_json_tools_uri_template_0_10.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/validator/.idea/libraries/Gradle__com_googlecode_libphonenumber_libphonenumber_8_11_1.xml b/validator/.idea/libraries/Gradle__com_googlecode_libphonenumber_libphonenumber_8_11_1.xml new file mode 100644 index 0000000000..128411021a --- /dev/null +++ b/validator/.idea/libraries/Gradle__com_googlecode_libphonenumber_libphonenumber_8_11_1.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/validator/.idea/libraries/Gradle__com_google_re2j_re2j_1_1.xml b/validator/.idea/libraries/Gradle__com_sun_mail_mailapi_1_6_2.xml similarity index 50% rename from validator/.idea/libraries/Gradle__com_google_re2j_re2j_1_1.xml rename to validator/.idea/libraries/Gradle__com_sun_mail_mailapi_1_6_2.xml index c30869dedd..d70a42d485 100644 --- a/validator/.idea/libraries/Gradle__com_google_re2j_re2j_1_1.xml +++ b/validator/.idea/libraries/Gradle__com_sun_mail_mailapi_1_6_2.xml @@ -1,11 +1,11 @@ - + - + - + \ No newline at end of file diff --git a/validator/.idea/libraries/Gradle__commons_beanutils_commons_beanutils_1_9_2.xml b/validator/.idea/libraries/Gradle__commons_beanutils_commons_beanutils_1_9_2.xml deleted file mode 100644 index f564ac0fad..0000000000 --- a/validator/.idea/libraries/Gradle__commons_beanutils_commons_beanutils_1_9_2.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/validator/.idea/libraries/Gradle__commons_collections_commons_collections_3_2_2.xml b/validator/.idea/libraries/Gradle__commons_collections_commons_collections_3_2_2.xml deleted file mode 100644 index 03b4c932e9..0000000000 --- a/validator/.idea/libraries/Gradle__commons_collections_commons_collections_3_2_2.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/validator/.idea/libraries/Gradle__commons_digester_commons_digester_1_8_1.xml b/validator/.idea/libraries/Gradle__commons_digester_commons_digester_1_8_1.xml deleted file mode 100644 index 0482c8e86a..0000000000 --- a/validator/.idea/libraries/Gradle__commons_digester_commons_digester_1_8_1.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/validator/.idea/libraries/Gradle__commons_validator_commons_validator_1_6.xml b/validator/.idea/libraries/Gradle__commons_validator_commons_validator_1_6.xml deleted file mode 100644 index 06fde17888..0000000000 --- a/validator/.idea/libraries/Gradle__commons_validator_commons_validator_1_6.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/validator/.idea/libraries/Gradle__joda_time_joda_time_2_10_5.xml b/validator/.idea/libraries/Gradle__joda_time_joda_time_2_10_5.xml new file mode 100644 index 0000000000..939f1077ce --- /dev/null +++ b/validator/.idea/libraries/Gradle__joda_time_joda_time_2_10_5.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/validator/.idea/libraries/Gradle__joda_time_joda_time_2_9_4.xml b/validator/.idea/libraries/Gradle__joda_time_joda_time_2_9_4.xml deleted file mode 100644 index 1bab911479..0000000000 --- a/validator/.idea/libraries/Gradle__joda_time_joda_time_2_9_4.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/validator/.idea/libraries/Gradle__net_sf_jopt_simple_jopt_simple_5_0_4.xml b/validator/.idea/libraries/Gradle__net_sf_jopt_simple_jopt_simple_5_0_4.xml new file mode 100644 index 0000000000..13d6fc8db0 --- /dev/null +++ b/validator/.idea/libraries/Gradle__net_sf_jopt_simple_jopt_simple_5_0_4.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/validator/.idea/libraries/Gradle__org_json_json_20180130.xml b/validator/.idea/libraries/Gradle__org_mozilla_rhino_1_7_7_2.xml similarity index 50% rename from validator/.idea/libraries/Gradle__org_json_json_20180130.xml rename to validator/.idea/libraries/Gradle__org_mozilla_rhino_1_7_7_2.xml index 83318a7eed..9dd289ab25 100644 --- a/validator/.idea/libraries/Gradle__org_json_json_20180130.xml +++ b/validator/.idea/libraries/Gradle__org_mozilla_rhino_1_7_7_2.xml @@ -1,11 +1,11 @@ - + - + - + \ No newline at end of file diff --git a/validator/.idea/modules/daq-validator.validator.iml b/validator/.idea/modules/daq-validator.validator.iml index 5e4bdcaf28..45185cabc1 100644 --- a/validator/.idea/modules/daq-validator.validator.iml +++ b/validator/.idea/modules/daq-validator.validator.iml @@ -23,8 +23,9 @@ + + - @@ -47,20 +48,18 @@ + - - - - - + + + + - - @@ -68,7 +67,13 @@ + + + + + + @@ -86,14 +91,12 @@ - - - - + + diff --git a/validator/src/main/java/com/google/daq/mqtt/validator/Validator.java b/validator/src/main/java/com/google/daq/mqtt/validator/Validator.java index 06b3ac7fdb..d29d857474 100644 --- a/validator/src/main/java/com/google/daq/mqtt/validator/Validator.java +++ b/validator/src/main/java/com/google/daq/mqtt/validator/Validator.java @@ -578,7 +578,7 @@ private JsonSchema getSchema(File schemaFile) { return JsonSchemaFactory.newBuilder() .setLoadingConfiguration( LoadingConfiguration.newBuilder() - .addScheme("scheme", new RelativeDownloader()) + .addScheme("file", new RelativeDownloader()) .freeze()) .freeze() .getJsonSchema(OBJECT_MAPPER.readTree(schemaStream)); @@ -592,7 +592,7 @@ class RelativeDownloader implements URIDownloader { @Override public InputStream fetch(URI source) { - String url = source.getPath(); + String url = source.toString(); try { if (!url.startsWith(FILE_URL_PREFIX)) { throw new IllegalStateException("Expected path to start with " + FILE_URL_PREFIX); @@ -631,13 +631,11 @@ private List makeFileList(String prefix, File partialTarget) { } private void validateMessage(JsonSchema schema, Object message) throws ProcessingException { - final JsonNode jsonNode; try { - jsonNode = OBJECT_MAPPER.valueToTree(message); + validateJsonNode(schema, OBJECT_MAPPER.valueToTree(message)); } catch (Exception e) { throw new RuntimeException("While converting to json node", e); } - validateJsonNode(schema, OBJECT_MAPPER.valueToTree(message)); } private void validateFile(