CDRIVER-2239 Rename bson_as_[canonical|relaxed]_json() to bson_as_[canonical|relaxed]_extended_json()

bjori · bjori · commit f41aec511e22 · 2017-08-08T15:41:36.000-07:00
diff --git a/doc/cursors.rst b/doc/cursors.rst
@@ -24,7 +24,7 @@ While iterating cursors, you should check to see if an error has occurred. See t
      cursor = mongoc_collection_find_with_opts (collection, query, NULL, NULL);
 
      while (mongoc_cursor_next (cursor, &doc)) {
-        str = bson_as_canonical_json (doc, NULL);
+        str = bson_as_canonical_extended_json (doc, NULL);
         printf ("%s\n", str);
         bson_free (str);
      }
diff --git a/doc/mongoc_collection_command_simple.rst b/doc/mongoc_collection_command_simple.rst
@@ -67,7 +67,7 @@ The following is an example of executing the collection stats command.
 
      if (mongoc_collection_command_simple (
             collection, cmd, NULL, &reply, &error)) {
-        str = bson_as_canonical_json (&reply, NULL);
+        str = bson_as_canonical_extended_json (&reply, NULL);
         printf ("%s\n", str);
         bson_free (str);
      } else {
diff --git a/doc/mongoc_collection_find.rst b/doc/mongoc_collection_find.rst
@@ -83,7 +83,7 @@ Example
         collection, MONGOC_QUERY_NONE, 0, 0, 0, query, NULL, NULL);
 
      while (mongoc_cursor_next (cursor, &doc)) {
-        str = bson_as_canonical_json (doc, NULL);
+        str = bson_as_canonical_extended_json (doc, NULL);
         printf ("%s\n", str);
         bson_free (str);
      }
diff --git a/doc/mongoc_collection_find_with_opts.rst b/doc/mongoc_collection_find_with_opts.rst
@@ -62,7 +62,7 @@ Examples
      cursor = mongoc_collection_find_with_opts (collection, filter, opts, NULL);
 
      while (mongoc_cursor_next (cursor, &doc)) {
-        str = bson_as_canonical_json (doc, NULL);
+        str = bson_as_canonical_extended_json (doc, NULL);
         printf ("%s\n", str);
         bson_free (str);
      }
diff --git a/doc/mongoc_matcher_t.rst b/doc/mongoc_matcher_t.rst
@@ -76,7 +76,7 @@ Example
 
      while ((bson = bson_reader_read (reader, NULL))) {
         if (mongoc_matcher_match (matcher, bson)) {
-           str = bson_as_canonical_json (bson, NULL);
+           str = bson_as_canonical_extended_json (bson, NULL);
            printf ("%s\n", str);
            bson_free (str);
         }
diff --git a/doc/mongoc_read_prefs_set_tags.rst b/doc/mongoc_read_prefs_set_tags.rst
@@ -62,7 +62,7 @@ Examples
          mongoc_collection_find_with_opts (collection, &filter, NULL, read_prefs);
 
       while (mongoc_cursor_next (cursor, &doc)) {
-         str = bson_as_canonical_json (doc, NULL);
+         str = bson_as_canonical_extended_json (doc, NULL);
          printf ("%s\n", str);
          bson_free (str);
       }
diff --git a/doc/mongoc_uri_get_mechanism_properties.rst b/doc/mongoc_uri_get_mechanism_properties.rst
@@ -41,7 +41,7 @@ Example
      "&authMechanismProperties=SERVICE_NAME:other,CANONICALIZE_HOST_NAME:true");
 
   if (mongoc_uri_get_mechanism_properties (uri, &props)) {
-     char *json = bson_as_canonical_json (&props, NULL);
+     char *json = bson_as_canonical_extended_json (&props, NULL);
      printf ("%s\n", json);
      bson_free (json);
   } else {
diff --git a/doc/tutorial.rst b/doc/tutorial.rst
@@ -225,7 +225,7 @@ Use the following code:
      /*
       * Print the document as a JSON string.
       */
-     str = bson_as_canonical_json (document, NULL);
+     str = bson_as_canonical_extended_json (document, NULL);
      printf ("%s\n", str);
      bson_free (str);
 
@@ -284,7 +284,7 @@ Using BCON
      /*
       * Print the document as a JSON string.
       */
-     str = bson_as_canonical_json (document, NULL);
+     str = bson_as_canonical_extended_json (document, NULL);
      printf ("%s\n", str);
      bson_free (str);
 
@@ -322,7 +322,7 @@ For *single* documents, BSON can be created from JSON strings via :doc:`bson_new
         return EXIT_FAILURE;
      }
 
-     string = bson_as_canonical_json (bson, NULL);
+     string = bson_as_canonical_extended_json (bson, NULL);
      printf ("%s\n", string);
      bson_free (string);
 
@@ -452,7 +452,7 @@ This first example uses an empty query specifier to find all documents in the da
      cursor = mongoc_collection_find_with_opts (collection, query, NULL, NULL);
 
      while (mongoc_cursor_next (cursor, &doc)) {
-        str = bson_as_canonical_json (doc, NULL);
+        str = bson_as_canonical_extended_json (doc, NULL);
         printf ("%s\n", str);
         bson_free (str);
      }
@@ -511,7 +511,7 @@ To look for a specific document, add a specifier to ``query``. This example adds
      cursor = mongoc_collection_find_with_opts (collection, query, NULL, NULL);
 
      while (mongoc_cursor_next (cursor, &doc)) {
-        str = bson_as_canonical_json (doc, NULL);
+        str = bson_as_canonical_extended_json (doc, NULL);
         printf ("%s\n", str);
         bson_free (str);
      }
@@ -814,7 +814,7 @@ This example executes the `collStats <http://docs.mongodb.org/manual/reference/c
      command = BCON_NEW ("collStats", BCON_UTF8 ("mycoll"));
      if (mongoc_collection_command_simple (
             collection, command, NULL, &reply, &error)) {
-        str = bson_as_canonical_json (&reply, NULL);
+        str = bson_as_canonical_extended_json (&reply, NULL);
         printf ("%s\n", str);
         bson_free (str);
      } else {
diff --git a/examples/aggregation/aggregation1.c b/examples/aggregation/aggregation1.c
@@ -40,7 +40,7 @@ print_pipeline (mongoc_collection_t *collection)
       collection, MONGOC_QUERY_NONE, pipeline, NULL, NULL);
 
    while (mongoc_cursor_next (cursor, &doc)) {
-      str = bson_as_canonical_json (doc, NULL);
+      str = bson_as_canonical_extended_json (doc, NULL);
       printf ("%s\n", str);
       bson_free (str);
    }
diff --git a/examples/bulk/bulk-collation.c b/examples/bulk/bulk-collation.c
@@ -42,7 +42,7 @@ bulk_collation (mongoc_collection_t *collection)
 
    ret = mongoc_bulk_operation_execute (bulk, &reply, &error);
 
-   str = bson_as_canonical_json (&reply, NULL);
+   str = bson_as_canonical_extended_json (&reply, NULL);
    printf ("%s\n", str);
    bson_free (str);
 
diff --git a/examples/bulk/bulk1.c b/examples/bulk/bulk1.c
@@ -24,7 +24,7 @@ bulk1 (mongoc_collection_t *collection)
 
    ret = mongoc_bulk_operation_execute (bulk, &reply, &error);
 
-   str = bson_as_canonical_json (&reply, NULL);
+   str = bson_as_canonical_extended_json (&reply, NULL);
    printf ("%s\n", str);
    bson_free (str);
 
diff --git a/examples/bulk/bulk2.c b/examples/bulk/bulk2.c
@@ -55,7 +55,7 @@ bulk2 (mongoc_collection_t *collection)
 
    ret = mongoc_bulk_operation_execute (bulk, &reply, &error);
 
-   str = bson_as_canonical_json (&reply, NULL);
+   str = bson_as_canonical_extended_json (&reply, NULL);
    printf ("%s\n", str);
    bson_free (str);
 
diff --git a/examples/bulk/bulk3.c b/examples/bulk/bulk3.c
@@ -41,7 +41,7 @@ bulk3 (mongoc_collection_t *collection)
 
    ret = mongoc_bulk_operation_execute (bulk, &reply, &error);
 
-   str = bson_as_canonical_json (&reply, NULL);
+   str = bson_as_canonical_extended_json (&reply, NULL);
    printf ("%s\n", str);
    bson_free (str);
 
diff --git a/examples/bulk/bulk4.c b/examples/bulk/bulk4.c
@@ -31,7 +31,7 @@ bulk4 (mongoc_collection_t *collection)
 
    ret = mongoc_bulk_operation_execute (bulk, &reply, &error);
 
-   str = bson_as_canonical_json (&reply, NULL);
+   str = bson_as_canonical_extended_json (&reply, NULL);
    printf ("%s\n", str);
    bson_free (str);
 
diff --git a/examples/bulk/bulk5.c b/examples/bulk/bulk5.c
@@ -28,7 +28,7 @@ bulk5_fail (mongoc_collection_t *collection)
     * we created previously, so this will result in an error */
    ret = mongoc_bulk_operation_execute (bulk, &reply, &error);
 
-   str = bson_as_canonical_json (&reply, NULL);
+   str = bson_as_canonical_extended_json (&reply, NULL);
    printf ("%s\n", str);
    bson_free (str);
 
@@ -68,7 +68,7 @@ bulk5_success (mongoc_collection_t *collection)
 
    ret = mongoc_bulk_operation_execute (bulk, &reply, &error);
 
-   str = bson_as_canonical_json (&reply, NULL);
+   str = bson_as_canonical_extended_json (&reply, NULL);
    printf ("%s\n", str);
    bson_free (str);
 
diff --git a/examples/bulk/bulk6.c b/examples/bulk/bulk6.c
@@ -29,7 +29,7 @@ bulk6 (mongoc_collection_t *collection)
 
    ret = mongoc_bulk_operation_execute (bulk, &reply, &error);
 
-   str = bson_as_canonical_json (&reply, NULL);
+   str = bson_as_canonical_extended_json (&reply, NULL);
    printf ("%s\n", str);
    bson_free (str);
 
diff --git a/examples/doc-common-insert.c b/examples/doc-common-insert.c
@@ -41,7 +41,7 @@ void
 print_res (const bson_t *reply)
 {
    BSON_ASSERT (reply);
-   char *str = bson_as_canonical_json (reply, NULL);
+   char *str = bson_as_canonical_extended_json (reply, NULL);
    printf ("%s\n", str);
    bson_free (str);
 }
diff --git a/examples/example-client.c b/examples/example-client.c
@@ -53,7 +53,7 @@ main (int argc, char *argv[])
       NULL); /* read prefs, NULL for default */
 
    while (mongoc_cursor_next (cursor, &doc)) {
-      str = bson_as_canonical_json (doc, NULL);
+      str = bson_as_canonical_extended_json (doc, NULL);
       fprintf (stdout, "%s\n", str);
       bson_free (str);
    }
diff --git a/examples/example-command-monitoring.c b/examples/example-command-monitoring.c
@@ -19,8 +19,8 @@ command_started (const mongoc_apm_command_started_t *event)
 {
    char *s;
 
-   s = bson_as_canonical_json (mongoc_apm_command_started_get_command (event),
-                              NULL);
+   s = bson_as_canonical_extended_json (
+      mongoc_apm_command_started_get_command (event), NULL);
    printf ("Command %s started on %s:\n%s\n\n",
            mongoc_apm_command_started_get_command_name (event),
            mongoc_apm_command_started_get_host (event)->host,
@@ -37,8 +37,8 @@ command_succeeded (const mongoc_apm_command_succeeded_t *event)
 {
    char *s;
 
-   s = bson_as_canonical_json (mongoc_apm_command_succeeded_get_reply (event),
-                              NULL);
+   s = bson_as_canonical_extended_json (
+      mongoc_apm_command_succeeded_get_reply (event), NULL);
    printf ("Command %s succeeded:\n%s\n\n",
            mongoc_apm_command_succeeded_get_command_name (event),
            s);
diff --git a/examples/example-command-with-opts.c b/examples/example-command-with-opts.c
@@ -72,7 +72,7 @@ main (int argc, char *argv[])
 
    if (mongoc_client_write_command_with_opts (
           client, "test", cmd, opts, &reply, &error)) {
-      json = bson_as_canonical_json (&reply, NULL);
+      json = bson_as_canonical_extended_json (&reply, NULL);
       printf ("cloneCollectionAsCapped: %s\n", json);
       bson_free (json);
    } else {
@@ -116,7 +116,7 @@ main (int argc, char *argv[])
 
    if (mongoc_client_read_command_with_opts (
           client, "test", cmd, read_prefs, opts, &reply, &error)) {
-      json = bson_as_canonical_json (&reply, NULL);
+      json = bson_as_canonical_extended_json (&reply, NULL);
       printf ("distinct: %s\n", json);
       bson_free (json);
    } else {
diff --git a/examples/example-matcher.c b/examples/example-matcher.c
@@ -8,8 +8,8 @@ log_query (const bson_t *doc, const bson_t *query)
    char *str1;
    char *str2;
 
-   str1 = bson_as_canonical_json (doc, NULL);
-   str2 = bson_as_canonical_json (query, NULL);
+   str1 = bson_as_canonical_extended_json (doc, NULL);
+   str2 = bson_as_canonical_extended_json (query, NULL);
 
    printf ("Matching %s against %s\n", str2, str1);
 
diff --git a/examples/example-sdam-monitoring.c b/examples/example-sdam-monitoring.c
@@ -161,7 +161,7 @@ server_heartbeat_succeeded (
       (stats_t *) mongoc_apm_server_heartbeat_succeeded_get_context (event);
    context->heartbeat_succeeded_events++;
 
-   reply = bson_as_canonical_json (
+   reply = bson_as_canonical_extended_json (
       mongoc_apm_server_heartbeat_succeeded_get_reply (event), NULL);
 
    printf (
diff --git a/examples/filter-bsondump.c b/examples/filter-bsondump.c
@@ -52,7 +52,7 @@ main (int argc, char *argv[])
 
    while ((bson = bson_reader_read (reader, NULL))) {
       if (mongoc_matcher_match (matcher, bson)) {
-         str = bson_as_canonical_json (bson, NULL);
+         str = bson_as_canonical_extended_json (bson, NULL);
          printf ("%s\n", str);
          bson_free (str);
       }
diff --git a/examples/find-and-modify.c b/examples/find-and-modify.c
@@ -51,7 +51,7 @@ main (int argc, char *argv[])
    /*
     * Print the result as JSON.
     */
-   str = bson_as_canonical_json (&reply, NULL);
+   str = bson_as_canonical_extended_json (&reply, NULL);
    printf ("%s\n", str);
    bson_free (str);
 
diff --git a/examples/find_and_modify_with_opts/bypass.c b/examples/find_and_modify_with_opts/bypass.c
@@ -29,7 +29,7 @@ fam_bypass (mongoc_collection_t *collection)
    if (success) {
       char *str;
 
-      str = bson_as_canonical_json (&reply, NULL);
+      str = bson_as_canonical_extended_json (&reply, NULL);
       printf ("%s\n", str);
       bson_free (str);
    } else {
diff --git a/examples/find_and_modify_with_opts/fields.c b/examples/find_and_modify_with_opts/fields.c
@@ -34,7 +34,7 @@ fam_fields (mongoc_collection_t *collection)
    if (success) {
       char *str;
 
-      str = bson_as_canonical_json (&reply, NULL);
+      str = bson_as_canonical_extended_json (&reply, NULL);
       printf ("%s\n", str);
       bson_free (str);
    } else {
diff --git a/examples/find_and_modify_with_opts/flags.c b/examples/find_and_modify_with_opts/flags.c
@@ -35,7 +35,7 @@ fam_flags (mongoc_collection_t *collection)
    if (success) {
       char *str;
 
-      str = bson_as_canonical_json (&reply, NULL);
+      str = bson_as_canonical_extended_json (&reply, NULL);
       printf ("%s\n", str);
       bson_free (str);
    } else {
diff --git a/examples/find_and_modify_with_opts/opts.c b/examples/find_and_modify_with_opts/opts.c
@@ -36,7 +36,7 @@ fam_opts (mongoc_collection_t *collection)
    if (success) {
       char *str;
 
-      str = bson_as_canonical_json (&reply, NULL);
+      str = bson_as_canonical_extended_json (&reply, NULL);
       printf ("%s\n", str);
       bson_free (str);
    } else {
diff --git a/examples/find_and_modify_with_opts/sort.c b/examples/find_and_modify_with_opts/sort.c
@@ -30,7 +30,7 @@ fam_sort (mongoc_collection_t *collection)
    if (success) {
       char *str;
 
-      str = bson_as_canonical_json (&reply, NULL);
+      str = bson_as_canonical_extended_json (&reply, NULL);
       printf ("%s\n", str);
       bson_free (str);
    } else {
diff --git a/examples/find_and_modify_with_opts/update.c b/examples/find_and_modify_with_opts/update.c
@@ -31,7 +31,7 @@ fam_update (mongoc_collection_t *collection)
    if (success) {
       char *str;
 
-      str = bson_as_canonical_json (&reply, NULL);
+      str = bson_as_canonical_extended_json (&reply, NULL);
       printf ("%s\n", str);
       bson_free (str);
    } else {
diff --git a/examples/mongoc-ping.c b/examples/mongoc-ping.c
@@ -64,7 +64,7 @@ main (int argc, char *argv[])
    cursor = mongoc_database_command (
       database, (mongoc_query_flags_t) 0, 0, 1, 0, &ping, NULL, NULL);
    if (mongoc_cursor_next (cursor, &reply)) {
-      str = bson_as_canonical_json (reply, NULL);
+      str = bson_as_canonical_extended_json (reply, NULL);
       fprintf (stdout, "%s\n", str);
       bson_free (str);
    } else if (mongoc_cursor_error (cursor, &error)) {
diff --git a/examples/mongoc-tail.c b/examples/mongoc-tail.c
@@ -13,7 +13,7 @@ print_bson (const bson_t *b)
 {
    char *str;
 
-   str = bson_as_canonical_json (b, NULL);
+   str = bson_as_canonical_extended_json (b, NULL);
    fprintf (stdout, "%s\n", str);
    bson_free (str);
 }
diff --git a/src/mongoc/mongoc-cluster-cyrus.c b/src/mongoc/mongoc-cluster-cyrus.c
diff --git a/src/mongoc/mongoc-rpc.c b/src/mongoc/mongoc-rpc.c
diff --git a/tests/TestSuite.h b/tests/TestSuite.h
diff --git a/tests/ha-test.c b/tests/ha-test.c
diff --git a/tests/json-test.c b/tests/json-test.c
diff --git a/tests/test-conveniences.c b/tests/test-conveniences.c
diff --git a/tests/test-load.c b/tests/test-load.c
diff --git a/tests/test-mongoc-command-monitoring.c b/tests/test-mongoc-command-monitoring.c
diff --git a/tests/test-mongoc-matcher.c b/tests/test-mongoc-matcher.c
diff --git a/tests/test-replica-set.c b/tests/test-replica-set.c
diff --git a/tests/test-secondary.c b/tests/test-secondary.c

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ While iterating cursors, you should check to see if an error has occurred. See t`
`24`	`24`	`cursor = mongoc_collection_find_with_opts (collection, query, NULL, NULL);`
`25`	`25`
`26`	`26`	`while (mongoc_cursor_next (cursor, &doc)) {`
`27`		`- str = bson_as_canonical_json (doc, NULL);`
	`27`	`+ str = bson_as_canonical_extended_json (doc, NULL);`
`28`	`28`	`printf ("%s\n", str);`
`29`	`29`	`bson_free (str);`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ Example`
`83`	`83`	`collection, MONGOC_QUERY_NONE, 0, 0, 0, query, NULL, NULL);`
`84`	`84`
`85`	`85`	`while (mongoc_cursor_next (cursor, &doc)) {`
`86`		`- str = bson_as_canonical_json (doc, NULL);`
	`86`	`+ str = bson_as_canonical_extended_json (doc, NULL);`
`87`	`87`	`printf ("%s\n", str);`
`88`	`88`	`bson_free (str);`
`89`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ Examples`
`62`	`62`	`cursor = mongoc_collection_find_with_opts (collection, filter, opts, NULL);`
`63`	`63`
`64`	`64`	`while (mongoc_cursor_next (cursor, &doc)) {`
`65`		`- str = bson_as_canonical_json (doc, NULL);`
	`65`	`+ str = bson_as_canonical_extended_json (doc, NULL);`
`66`	`66`	`printf ("%s\n", str);`
`67`	`67`	`bson_free (str);`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ Example`
`76`	`76`
`77`	`77`	`while ((bson = bson_reader_read (reader, NULL))) {`
`78`	`78`	`if (mongoc_matcher_match (matcher, bson)) {`
`79`		`- str = bson_as_canonical_json (bson, NULL);`
	`79`	`+ str = bson_as_canonical_extended_json (bson, NULL);`
`80`	`80`	`printf ("%s\n", str);`
`81`	`81`	`bson_free (str);`
`82`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ print_pipeline (mongoc_collection_t *collection)`
`40`	`40`	`collection, MONGOC_QUERY_NONE, pipeline, NULL, NULL);`
`41`	`41`
`42`	`42`	`while (mongoc_cursor_next (cursor, &doc)) {`
`43`		`- str = bson_as_canonical_json (doc, NULL);`
	`43`	`+ str = bson_as_canonical_extended_json (doc, NULL);`
`44`	`44`	`printf ("%s\n", str);`
`45`	`45`	`bson_free (str);`
`46`	`46`	`}`