Merge branch 'v4.11' of github.com:mongodb/docs-java into v4.11

Author: rustagir

source/fundamentals/builders/aggregates.txt

@@ -2,6 +2,13 @@
 Aggregates Builders
 ===================
 
+.. facet::
+   :name: genre
+   :values: reference
+ 
+.. meta::
+   :keywords: code examples
+
 .. contents:: On this page
    :local:
    :backlinks: none

source/fundamentals/connection/jndi.txt

@@ -10,6 +10,12 @@ Connect to MongoDB by Using a JNDI Datasource
    :depth: 2
    :class: singlecol
 
+.. facet::
+   :name: genre
+   :values: tutorial
+
+.. meta::
+   :keywords: code example, wildfly, tomcat
 
 Overview
 --------
@@ -31,9 +37,15 @@ JNDI Datasource.
       :tabid: wildfly
 
       1. In a `Wildfly <https://wildfly.org/>`__ installation, create a new module
-         for MongoDB at ``modules/system/layers/base/org/mongodb/main``. Copy the
-         ``mongo-java-driver.jar`` jar file into the module. Add the following
-         ``module.xml`` file into the module:
+         for MongoDB at ``modules/system/layers/base/org/mongodb/main``. Copy
+         the following jar files into the module:
+
+         - ``mongodb-driver-sync-{+full-version+}.jar``
+         - ``mongodb-driver-core-{+full-version+}.jar``
+         - ``bson-{+full-version+}.jar``
+         - ``bson-record-codec-{+full-version+}.jar``
+         
+         Add the following ``module.xml`` file into the module:
 
          .. literalinclude:: /includes/fundamentals/code-snippets/wildfly-module-with-version.xml
             :language: xml
@@ -67,8 +79,13 @@ JNDI Datasource.
    .. tab:: Tomcat
       :tabid: tomcat
 
-      1. Copy the ``mongo-java-driver.jar`` jar file into the ``lib`` directory
-         of your `Tomcat <https://tomcat.apache.org/>`__ installation.
+      1. Copy the following jar files into the ``lib`` directory
+         of your `Tomcat <https://tomcat.apache.org/>`__ installation:
+
+         - ``mongodb-driver-sync-{+full-version+}.jar``
+         - ``mongodb-driver-core-{+full-version+}.jar``
+         - ``bson-{+full-version+}.jar``
+         - ``bson-record-codec-{+full-version+}.jar``
 
       #. In the ``context.xml`` file of your application, add a resource that references
          the ``MongoClientFactory`` class and the :ref:`connection string
@@ -78,7 +95,7 @@ JNDI Datasource.
 
             <Resource name="mongodb/MyMongoClient"
                auth="Container"
-               type="com.mongodb.MongoClient"
+               type="com.mongodb.client.MongoClient"
                closeMethod="close"
                factory="com.mongodb.client.MongoClientFactory"
                singleton="true"

source/includes/fundamentals/code-snippets/builders/AggBuilders.java

@@ -82,8 +82,7 @@ public static void main(String[] args) {
         page.bucketAutoOptionsStage();
         page.facetStage();
         page.vectorSearchPipeline();
-// Fix required: https://jira.mongodb.org/browse/DOCSP-33327
-//        page.setWindowFieldsStage();
+        page.setWindowFieldsStage();
         page.aggregationExample();
     }
 
@@ -95,16 +94,14 @@ private void aggregationExample() {
         // end aggregationSample
     }
 
-    /* Fix required: https://jira.mongodb.org/browse/DOCSP-33327
     private void setWindowFieldsStage() {
         // begin setWindowFields
         Window pastMonth = Windows.timeRange(-1, MongoTimeUnit.MONTH, Windows.Bound.CURRENT);
         setWindowFields("$localityId", Sorts.ascending("measurementDateTime"),
-                WindowedComputations.sum("monthlyRainfall", "$rainfall", pastMonth),
-                WindowedComputations.avg("monthlyAvgTemp", "$temperature", pastMonth));
+                WindowOutputFields.sum("monthlyRainfall", "$rainfall", pastMonth),
+                WindowOutputFields.avg("monthlyAvgTemp", "$temperature", pastMonth));
         // end setWindowFields
     }
-     */
 
     private void facetStage() {
         // begin facet
@@ -258,10 +255,11 @@ private void advancedLookupStage() {
         Bson innerJoinLookup = lookup("warehouses", variables, pipeline, "stockdata");
         // end advanced lookup
         // Missing advancedLookup assignment
-//        MongoCursor<Document> cursor = collection.aggregate(asList(advancedLookup)).cursor();
-//        cursor.forEachRemaining(doc -> System.out.println(doc.toJson()));
-//        database = mongoClient.getDatabase("sample_mflix");
-//        collection = database.getCollection("movies");
+        // MongoCursor<Document> cursor =
+        // collection.aggregate(asList(advancedLookup)).cursor();
+        // cursor.forEachRemaining(doc -> System.out.println(doc.toJson()));
+        // database = mongoClient.getDatabase("sample_mflix");
+        // collection = database.getCollection("movies");
     }
 
     private void basicLookupStage() {
@@ -332,7 +330,7 @@ private void vectorSearchPipeline() {
                         limit,
                         options),
                 project(
-                    metaVectorSearchScore("vectorSearchScore")));
+                        metaVectorSearchScore("vectorSearchScore")));
         // end vectorSearch
 
         // begin vectorSearch-output
@@ -345,7 +343,6 @@ private void vectorSearchPipeline() {
         // Example output: "vectorSearch score: 0.887437105178833"
     }
 
-
     private void documentsStage() {
         // begin documents
         documents(asList(

source/whats-new.txt

@@ -29,15 +29,13 @@ Learn what's new in:
 
 .. _upcoming-breaking-changes:
 
-Upcoming Breaking Changes
--------------------------
+.. Upcoming Breaking Changes
+   -------------------------
 
 .. Relocate these items into the source/upgrade.txt page once they become breaking changes
 
-In addition to the deprecations mentioned in specific driver versions on this
-page, anticipated breaking changes include the following:
-
-- Beginning with v5.0, the {+driver-short+} requires Java 11 or later.
+.. In addition to the deprecations mentioned in specific driver versions on this
+   page, anticipated breaking changes include the following:
 
 .. _version-4.11: