Skip to content

Commit 89ba82a

Browse files
rustagirrustagir
committed
Merge branch 'master' of github.com:mongodb/docs-java into DOCSP-35923-timeout-setting
2 parents 4c4e235 + 230c827 commit 89ba82a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+771
-1474
lines changed

‎config/redirects

Lines changed: 67 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,76 @@
11
define: prefix docs/drivers/java/sync
22
define: base https://www.mongodb.com/${prefix}
3-
define: versions v4.3 v4.4 v4.5 v4.6 v4.7 v4.8 v4.9 v4.10 v4.11 v5.0 v5.1 v5.2 v5.3 master
3+
define: versions v4.3 v4.4 v4.5 v4.6 v4.7 v4.8 v4.9 v4.10 v4.11 v5.0 v5.1 v5.2 v5.3 v5.4 master
44

5-
symlink: current -> v5.3
5+
symlink: current -> v5.4
66
symlink: upcoming -> master
77

88
raw: ${prefix}/ -> ${base}/current/
99
raw: ${prefix}/master -> ${base}/upcoming/
1010

1111
[*-v5.2]: ${prefix}/${version}/fundamentals/versioned-api/ -> ${base}/${version}/fundamentals/stable-api/
12-
[*-v4.6]: ${prefix}/${version}/fundamentals/crud/read-operations/change-streams/ -> ${base}/${version}/fundamentals/crud/read-operations/retrieve/
13-
[*-master]: ${prefix}/${version}/fundamentals/csfle/ -> ${base}/${version}/fundamentals/encrypt-fields/
14-
[*-master]: ${prefix}/${version}/fundamentals/crud/write-operations/change-a-document/ -> ${base}/${version}/fundamentals/crud/write-operations/modify/
15-
[*-v4.10]: ${prefix}/${version}/fundamentals/connection/socks/ -> ${base}/${version}/
16-
[*-v4.8]: ${prefix}/${version}/connection-troubleshooting/ -> ${base}/${version}/
17-
[*-master]: ${prefix}/${version}/fundamentals/crud/ -> ${base}/${version}/crud/
18-
[*-master]: ${prefix}/${version}/fundamentals/crud/read-operations/ -> ${base}/${version}/crud/query-documents/
19-
[*-master]: ${prefix}/${version}/fundamentals/crud/read-operations/retrieve/ -> ${base}/${version}/crud/query-documents/find/
20-
[*-master]: ${prefix}/${version}/fundamentals/crud/read-operations/cursor/ -> ${base}/${version}/crud/query-documents/cursor/
21-
[*-master]: ${prefix}/${version}/fundamentals/crud/read-operations/change-streams/ -> ${base}/${version}/logging-monitoring/change-streams/
22-
[*-master]: ${prefix}/${version}/fundamentals/crud/read-operations/sort/ -> ${base}/${version}/crud/query-documents/sort/
23-
[*-master]: ${prefix}/${version}/fundamentals/crud/read-operations/skip/ -> ${base}/${version}/crud/query-documents/skip/
24-
[*-master]: ${prefix}/${version}/fundamentals/crud/read-operations/limit/ -> ${base}/${version}/crud/query-documents/limit/
25-
[*-master]: ${prefix}/${version}/fundamentals/crud/read-operations/project/ -> ${base}/${version}/crud/query-documents/project/
26-
[*-master]: ${prefix}/${version}/fundamentals/crud/read-operations/geo/ -> ${base}/${version}/crud/query-documents/geo/
27-
[*-master]: ${prefix}/${version}/fundamentals/crud/read-operations/text/ -> ${base}/${version}/crud/query-documents/text/
28-
[*-master]: ${prefix}/${version}/fundamentals/crud/write-operations/ -> ${base}/${version}/crud/insert/
29-
[*-master]: ${prefix}/${version}/fundamentals/crud/write-operations/insert/ -> ${base}/${version}/crud/insert/
30-
[*-master]: ${prefix}/${version}/fundamentals/crud/write-operations/delete/ -> ${base}/${version}/crud/update-documents/delete/
31-
[*-master]: ${prefix}/${version}/fundamentals/crud/write-operations/modify/ -> ${base}/${version}/crud/update-documents/
32-
[*-master]: ${prefix}/${version}/fundamentals/crud/write-operations/embedded-arrays/ -> ${base}/${version}/crud/update-documents/embedded-arrays/
33-
[*-master]: ${prefix}/${version}/fundamentals/crud/write-operations/upsert/ -> ${base}/${version}/crud/update-documents/upsert/
34-
[*-master]: ${prefix}/${version}/fundamentals/crud/write-operations/bulk/ -> ${base}/${version}/crud/bulk/
35-
[*-master]: ${prefix}/${version}/fundamentals/crud/query-document/ -> ${base}/${version}/crud/query-documents/specify-query/
36-
[*-master]: ${prefix}/${version}/fundamentals/crud/compound-operations/ -> ${base}/${version}/crud/compound-operations/
37-
[*-master]: ${prefix}/${version}/fundamentals/data-formats/ -> ${base}/${version}/data-formats/
38-
[*-master]: ${prefix}/${version}/fundamentals/data-formats/document-data-format-bson/ -> ${base}/${version}/data-formats/document-data-format-bson/
39-
[*-master]: ${prefix}/${version}/fundamentals/data-formats/document-data-format-extended-json/ -> ${base}/${version}/data-formats/document-data-format-extended-json/
40-
[*-master]: ${prefix}/${version}/fundamentals/data-formats/documents/ -> ${base}/${version}/data-formats/documents/
41-
[*-master]: ${prefix}/${version}/fundamentals/data-formats/document-data-format-pojo/ -> ${base}/${version}/data-formats/document-data-format-pojo/
42-
[*-master]: ${prefix}/${version}/fundamentals/data-formats/document-data-format-record/ -> ${base}/${version}/data-formats/document-data-format-record/
43-
[*-master]: ${prefix}/${version}/fundamentals/data-formats/pojo-customization/ -> ${base}/${version}/data-formats/pojo-customization/
44-
[*-master]: ${prefix}/${version}/fundamentals/data-formats/codecs/ -> ${base}/${version}/data-formats/codecs/
45-
[*-master]: ${prefix}/${version}/fundamentals/connection/ -> ${base}/${version}/connection/
46-
[*-master]: ${prefix}/${version}/fundamentals/connection/connect/ -> ${base}/${version}/connection/mongoclient
47-
[*-master]: ${prefix}/${version}/fundamentals/connection/connection-options/ -> ${base}/${version}/connection/connection-options/
48-
[*-master]: ${prefix}/${version}/fundamentals/connection/mongoclientsettings/ -> ${base}/${version}/connection/mongoclientsettings/
49-
[*-master]: ${prefix}/${version}/fundamentals/connection/network-compression/ -> ${base}/${version}/connection/network-compression/
50-
[*-master]: ${prefix}/${version}/fundamentals/connection/socks/ -> ${base}/${version}/connection/socks/
51-
[*-master]: ${prefix}/${version}/fundamentals/connection/tls/ -> ${base}/${version}/security/tls/
52-
[*-master]: ${prefix}/${version}/fundamentals/connection/jndi/ -> ${base}/${version}/connection/jndi/
53-
[*-master]: ${prefix}/${version}/fundamentals/builders/ -> ${base}/${version}/builders/
54-
[*-master]: ${prefix}/${version}/fundamentals/builders/aggregates/ -> ${base}/${version}/builders/aggregates/
55-
[*-master]: ${prefix}/${version}/fundamentals/builders/filters/ -> ${base}/${version}/builders/filters/
56-
[*-master]: ${prefix}/${version}/fundamentals/builders/indexes/ -> ${base}/${version}/builders/indexes/
57-
[*-master]: ${prefix}/${version}/fundamentals/builders/projections/ -> ${base}/${version}/builders/projections/
58-
[*-master]: ${prefix}/${version}/fundamentals/builders/sort/ -> ${base}/${version}/builders/sort/
59-
[*-master]: ${prefix}/${version}/fundamentals/builders/updates/ -> ${base}/${version}/builders/updates/
60-
[*-master]: ${prefix}/${version}/fundamentals/builders/vector-search -> ${base}/${version}/atlas-vector-search/
61-
[*-master]: ${prefix}/${version}/fundamentals/aggregation/ -> ${base}/${version}/aggregation/
62-
[*-master]: ${prefix}/${version}/fundamentals/aggregation-expression-operations/ -> ${base}/${version}/aggregation/aggregation-expression-operations/
63-
[*-master]: ${prefix}/${version}/fundamentals/collations/ -> ${base}/${version}/crud/collations/
64-
[*-master]: ${prefix}/${version}/fundamentals/stable-api/ -> ${base}/${version}/connection/stable-api/
65-
[*-master]: ${prefix}/${version}/connection-troubleshooting/ -> ${base}/${version}/connection/connection-troubleshooting/
66-
[*-master]: ${prefix}/${version}/fundamentals/gridfs/ -> ${base}/${version}/crud/gridfs/
67-
[*-master]: ${prefix}/${version}/fundamentals/transactions/ -> ${base}/${version}/crud/transactions/
68-
[*-master]: ${prefix}/${version}/fundamentals/time-series/ -> ${base}/${version}/data-formats/time-series/
69-
[*-master]: ${prefix}/${version}/quick-start/ -> ${base}/${version}/getting-started/
70-
[*-master]: ${prefix}/${version}/fundamentals/databases-collections/ -> ${base}/${version}/getting-started/databases-collections/
71-
[*-master]: ${prefix}/${version}/integrations/ -> ${base}/${version}/getting-started/integrations/
72-
[*-master]: ${prefix}/${version}/quick-reference/ -> ${base}/${version}/getting-started/quick-reference/
73-
[*-master]: ${prefix}/${version}/fundamentals/enterprise-auth/ -> ${base}/${version}/security/enterprise-auth/
74-
[*-master]: ${prefix}/${version}/connection/socks/ -> ${base}/${version}/security/socks/
12+
13+
# TOC evolution redirects
14+
15+
[v5.0-*]: ${prefix}/${version}/fundamentals/crud/ -> ${base}/${version}/crud/
16+
[v5.0-*]: ${prefix}/${version}/fundamentals/crud/read-operations/ -> ${base}/${version}/crud/query-documents/
17+
[v5.0-*]: ${prefix}/${version}/fundamentals/crud/read-operations/retrieve/ -> ${base}/${version}/crud/query-documents/find/
18+
[v5.0-*]: ${prefix}/${version}/fundamentals/crud/read-operations/cursor/ -> ${base}/${version}/crud/query-documents/cursor/
19+
[v5.0-*]: ${prefix}/${version}/fundamentals/crud/read-operations/change-streams/ -> ${base}/${version}/logging-monitoring/change-streams/
20+
[v5.0-*]: ${prefix}/${version}/fundamentals/crud/read-operations/sort/ -> ${base}/${version}/crud/query-documents/sort/
21+
[v5.0-*]: ${prefix}/${version}/fundamentals/crud/read-operations/skip/ -> ${base}/${version}/crud/query-documents/skip/
22+
[v5.0-*]: ${prefix}/${version}/fundamentals/crud/read-operations/limit/ -> ${base}/${version}/crud/query-documents/limit/
23+
[v5.0-*]: ${prefix}/${version}/fundamentals/crud/read-operations/project/ -> ${base}/${version}/crud/query-documents/project/
24+
[v5.0-*]: ${prefix}/${version}/fundamentals/crud/read-operations/geo/ -> ${base}/${version}/crud/query-documents/geo/
25+
[v5.0-*]: ${prefix}/${version}/fundamentals/crud/read-operations/text/ -> ${base}/${version}/crud/query-documents/text/
26+
[v5.0-*]: ${prefix}/${version}/fundamentals/crud/write-operations/ -> ${base}/${version}/crud/insert/
27+
[v5.0-*]: ${prefix}/${version}/fundamentals/crud/write-operations/insert/ -> ${base}/${version}/crud/insert/
28+
[v5.0-*]: ${prefix}/${version}/fundamentals/crud/write-operations/delete/ -> ${base}/${version}/crud/update-documents/delete/
29+
[v5.0-*]: ${prefix}/${version}/fundamentals/crud/write-operations/modify/ -> ${base}/${version}/crud/update-documents/
30+
[v5.0-*]: ${prefix}/${version}/fundamentals/crud/write-operations/embedded-arrays/ -> ${base}/${version}/crud/update-documents/embedded-arrays/
31+
[v5.0-*]: ${prefix}/${version}/fundamentals/crud/write-operations/upsert/ -> ${base}/${version}/crud/update-documents/upsert/
32+
[v5.0-*]: ${prefix}/${version}/fundamentals/crud/write-operations/bulk/ -> ${base}/${version}/crud/bulk/
33+
[v5.0-*]: ${prefix}/${version}/fundamentals/crud/query-document/ -> ${base}/${version}/crud/query-documents/specify-query/
34+
[v5.0-*]: ${prefix}/${version}/fundamentals/crud/compound-operations/ -> ${base}/${version}/crud/compound-operations/
35+
36+
[v5.0-*]: ${prefix}/${version}/fundamentals/data-formats/ -> ${base}/${version}/data-formats/
37+
[v5.0-*]: ${prefix}/${version}/fundamentals/data-formats/document-data-format-bson/ -> ${base}/${version}/data-formats/document-data-format-bson/
38+
[v5.0-*]: ${prefix}/${version}/fundamentals/data-formats/document-data-format-extended-json/ -> ${base}/${version}/data-formats/document-data-format-extended-json/
39+
[v5.0-*]: ${prefix}/${version}/fundamentals/data-formats/documents/ -> ${base}/${version}/data-formats/documents/
40+
[v5.0-*]: ${prefix}/${version}/fundamentals/data-formats/document-data-format-pojo/ -> ${base}/${version}/data-formats/document-data-format-pojo/
41+
[v5.0-*]: ${prefix}/${version}/fundamentals/data-formats/document-data-format-record/ -> ${base}/${version}/data-formats/document-data-format-record/
42+
[v5.0-*]: ${prefix}/${version}/fundamentals/data-formats/pojo-customization/ -> ${base}/${version}/data-formats/pojo-customization/
43+
[v5.0-*]: ${prefix}/${version}/fundamentals/data-formats/codecs/ -> ${base}/${version}/data-formats/codecs/
44+
45+
[v5.0-*]: ${prefix}/${version}/fundamentals/connection/ -> ${base}/${version}/connection/
46+
[v5.0-*]: ${prefix}/${version}/fundamentals/connection/connect/ -> ${base}/${version}/connection/mongoclient
47+
[v5.0-*]: ${prefix}/${version}/fundamentals/connection/connection-options/ -> ${base}/${version}/connection/connection-options/
48+
[v5.0-*]: ${prefix}/${version}/fundamentals/connection/mongoclientsettings/ -> ${base}/${version}/connection/mongoclientsettings/
49+
[v5.0-*]: ${prefix}/${version}/fundamentals/connection/network-compression/ -> ${base}/${version}/connection/network-compression/
50+
[v5.0-*]: ${prefix}/${version}/fundamentals/connection/socks/ -> ${base}/${version}/connection/socks/
51+
[v5.0-*]: ${prefix}/${version}/fundamentals/connection/tls/ -> ${base}/${version}/security/tls/
52+
[v5.0-*]: ${prefix}/${version}/fundamentals/connection/jndi/ -> ${base}/${version}/connection/jndi/
53+
54+
[v5.0-*]: ${prefix}/${version}/fundamentals/builders/ -> ${base}/${version}/builders/
55+
[v5.0-*]: ${prefix}/${version}/fundamentals/builders/aggregates/ -> ${base}/${version}/builders/aggregates/
56+
[v5.0-*]: ${prefix}/${version}/fundamentals/builders/filters/ -> ${base}/${version}/builders/filters/
57+
[v5.0-*]: ${prefix}/${version}/fundamentals/builders/indexes/ -> ${base}/${version}/builders/indexes/
58+
[v5.0-*]: ${prefix}/${version}/fundamentals/builders/projections/ -> ${base}/${version}/builders/projections/
59+
[v5.0-*]: ${prefix}/${version}/fundamentals/builders/sort/ -> ${base}/${version}/builders/sort/
60+
[v5.0-*]: ${prefix}/${version}/fundamentals/builders/updates/ -> ${base}/${version}/builders/updates/
61+
[v5.0-*]: ${prefix}/${version}/fundamentals/builders/vector-search -> ${base}/${version}/atlas-vector-search/
62+
63+
[v5.0-*]: ${prefix}/${version}/fundamentals/aggregation/ -> ${base}/${version}/aggregation/
64+
[v5.0-*]: ${prefix}/${version}/fundamentals/aggregation-expression-operations/ -> ${base}/${version}/aggregation/aggregation-expression-operations/
65+
[v5.0-*]: ${prefix}/${version}/fundamentals/collations/ -> ${base}/${version}/crud/collations/
66+
[v5.0-*]: ${prefix}/${version}/fundamentals/stable-api/ -> ${base}/${version}/connection/stable-api/
67+
[v5.0-*]: ${prefix}/${version}/connection-troubleshooting/ -> ${base}/${version}/connection/connection-troubleshooting/
68+
[v5.0-*]: ${prefix}/${version}/fundamentals/gridfs/ -> ${base}/${version}/crud/gridfs/
69+
[v5.0-*]: ${prefix}/${version}/fundamentals/transactions/ -> ${base}/${version}/crud/transactions/
70+
[v5.0-*]: ${prefix}/${version}/fundamentals/time-series/ -> ${base}/${version}/data-formats/time-series/
71+
[v5.0-*]: ${prefix}/${version}/quick-start/ -> ${base}/${version}/getting-started/
72+
[v5.0-*]: ${prefix}/${version}/fundamentals/databases-collections/ -> ${base}/${version}/getting-started/databases-collections/
73+
[v5.0-*]: ${prefix}/${version}/integrations/ -> ${base}/${version}/getting-started/integrations/
74+
[v5.0-*]: ${prefix}/${version}/quick-reference/ -> ${base}/${version}/getting-started/quick-reference/
75+
[v5.0-*]: ${prefix}/${version}/fundamentals/enterprise-auth/ -> ${base}/${version}/security/enterprise-auth/
76+
[v5.0-*]: ${prefix}/${version}/connection/socks/ -> ${base}/${version}/security/socks/

‎snooty.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ toc_landing_pages = [
1717
"/logging-monitoring",
1818
"/api-documentation",
1919
"/security",
20-
"/security/auth"
20+
"/security/auth",
2121
]
2222

2323
sharedinclude_root = "https://raw.githubusercontent.com/10gen/docs-shared/main/"
@@ -26,7 +26,7 @@ sharedinclude_root = "https://raw.githubusercontent.com/10gen/docs-shared/main/"
2626
driver = "java"
2727
driver-long = "MongoDB Java Driver"
2828
driver-short = "Java driver"
29-
version = "5.3"
29+
version = "5.4"
3030
full-version = "{+version+}.0"
3131
mdb-server = "MongoDB Server"
3232
package-name-org = "mongodb-org"

‎source/connection/connection-troubleshooting.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ against the connected secondary node if you set the read preference to
250250

251251
You can also specify the ``serverSelectionTimeoutMS`` connection option
252252
to adjust the amount of time in which the driver must select a server. To
253-
learn more, see the :ref:`java-connection-uri-options` guide.
253+
learn more, see the :ref:`mcs-cluster-settings` guide.
254254

255255
.. _java-miscellaneous-errors:
256256

‎source/connection/specify-connection-options/security-connection-options.txt

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)