NR PR fixes 1

Author: rustagir

source/get-started/pojo-qs.txt

@@ -10,8 +10,9 @@ Quick Start (POJO Examples)
    :depth: 1
    :class: singlecol
 
-This guide follows from the :ref:`Quick Start guide <javars-quickstart>`, but uses Plain
-Old Java Objects, or POJOs, to model documents.
+This guide follows from the :ref:`Quick Start guide
+<javars-quickstart>` but uses Plain Old Java Objects, or POJOs, to
+model documents.
 
 The code examples in this guide come from the `PojoQuickTour.java
 <{+driver-source-gh+}/blob/master/driver-reactive-streams/src/examples/reactivestreams/tour/PojoQuickTour.java>`__
@@ -54,101 +55,23 @@ this guide:
    import static org.bson.codecs.configuration.CodecRegistries.fromProviders;
    import static org.bson.codecs.configuration.CodecRegistries.fromRegistries;
 
-- POJO class definitions. The full code is available on GitHub
-  for the ``Person`` and ``Address`` POJOs. The following code
-  demonstrates the main implementation details:
-
-.. code-block:: java
-   
-   public final class Person {
-       private ObjectId id;
-       private String name;
-       private int age;
-       private Address address;
-   
-       public Person() {
-       }
-   
-       public ObjectId getId() {
-           return id;
-       }
-   
-       public void setId(final ObjectId id) {
-           this.id = id;
-       }
-   
-       public String getName() {
-           return name;
-       }
-   
-       public void setName(final String name) {
-           this.name = name;
-       }
-   
-       public int getAge() {
-           return age;
-       }
-   
-       public void setAge(final int age) {
-           this.age = age;
-       }
-   
-       public Address getAddress() {
-           return address;
-       }
-   
-       public void setAddress(final Address address) {
-           this.address = address;
-       }
-       
-       // Rest of implementation
-   }
-   
-   public final class Address {
-       private String street;
-       private String city;
-       private String zip;
-   
-       public Address() {
-       }
-   
-       public String getStreet() {
-           return street;
-       }
-   
-       public void setStreet(final String street) {
-           this.street = street;
-       }
-   
-       public String getCity() {
-           return city;
-       }
-   
-       public void setCity(final String city) {
-           this.city = city;
-       }
-   
-       public String getZip() {
-           return zip;
-       }
-   
-       public void setZip(final String zip) {
-           this.zip = zip;
-       }
-       
-       // Rest of implementation
-   }
+- POJO class definitions. Copy the full code for the ``Person`` and
+  ``Address`` POJOs from the driver source repository on
+  GitHub:
+  
+  - `Person class <{+driver-source-gh+}/blob/master/driver-reactive-streams/src/examples/reactivestreams/tour/Person.java>`__
+  - `Address class <{+driver-source-gh+}/blob/master/driver-reactive-streams/src/examples/reactivestreams/tour/Address.java>`__
 
 Creating a Custom CodecRegistry
 -------------------------------
 
 Before you can use a POJO with the driver, you need to configure the
-``CodecRegistry`` to include a codec to handle the translation to and
+``CodecRegistry`` to include a codec that handles the translation to and
 from BSON for your POJOs. The simplest way to do that is to use
 the ``PojoCodecProvider.builder()`` method to create and configure a
 ``CodecProvider``.
 
-The following example combines the default codec registry, with
+The following example combines the default codec registry with
 the ``PojoCodecProvider`` configured to automatically create POJO
 ``Codec`` instances:
 
@@ -174,24 +97,24 @@ use:
 
 - Set it when instantiating a ``MongoClient`` object:
 
-.. code-block:: java
-
-   MongoClientSettings settings = MongoClientSettings.builder()
-       .codecRegistry(pojoCodecRegistry)
-       .build();
-   MongoClient mongoClient = MongoClients.create(settings);
+  .. code-block:: java
+  
+     MongoClientSettings settings = MongoClientSettings.builder()
+         .codecRegistry(pojoCodecRegistry)
+         .build();
+     MongoClient mongoClient = MongoClients.create(settings);
 
 - Use an alternative ``CodecRegistry`` with a ``MongoDatabase``:
 
-.. code-block:: java
-
-   database = database.withCodecRegistry(pojoCodecRegistry);
+  .. code-block:: java
+  
+     database = database.withCodecRegistry(pojoCodecRegistry);
 
 - Use an alternative ``CodecRegistry`` with a ``MongoCollection``:
 
-.. code-block:: java
-
-   collection = collection.withCodecRegistry(pojoCodecRegistry);
+  .. code-block:: java
+  
+     collection = collection.withCodecRegistry(pojoCodecRegistry);
 
 Inserting a POJO into MongoDB
 -----------------------------
@@ -210,6 +133,8 @@ Before you can insert a POJO into MongoDB, create a
 Insert a Person Instance
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
+.. _javars-pojo-insertone:
+
 To insert a ``Person`` into the collection, use the collection's
 ``insertOne()`` method:
 
@@ -222,7 +147,8 @@ Insert Multiple Person Instances
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 To insert multiple ``Person`` instances, you can use the collection's
-``insertMany()`` method, which takes a list of ``Person`` instances.
+``insertMany()`` method, which takes a list of ``Person`` instances as a
+parameter.
 
 The following example will add multiple ``Person`` instances into the
 collection:
@@ -244,18 +170,22 @@ To query the collection, you can use the ``find()`` method.
 The following example prints all the ``Person`` instances in the
 collection:
 
-.. code-block:: java
+.. io-code-block::
+   :copyable: true
 
-   collection.find().subscribe(new PrintToStringSubscriber<>());
+   .. input::
+      :language: java
 
-The example prints the following result:
+      collection.find().subscribe(new PrintToStringSubscriber<>());
 
-.. code-block:: none
+   .. output::
+      :language: none
+      :visible: false
 
-   Person{id='...', name='Ada Byron', age=20, address=Address{street='St James Square', city='London', zip='W1'}}
-   Person{id='...', name='Charles Babbage', age=45, address=Address{street='5 Devonshire Street', city='London', zip='W11'}}
-   Person{id='...', name='Alan Turing', age=28, address=Address{street='Bletchley Hall', city='Bletchley Park', zip='MK12'}}
-   Person{id='...', name='Timothy Berners-Lee', age=61, address=Address{street='Colehill', city='Wimborne', zip='null'}}
+      Person{id='...', name='Ada Byron', age=20, address=Address{street='St James Square', city='London', zip='W1'}}
+      Person{id='...', name='Charles Babbage', age=45, address=Address{street='5 Devonshire Street', city='London', zip='W11'}}
+      Person{id='...', name='Alan Turing', age=28, address=Address{street='Bletchley Hall', city='Bletchley Park', zip='MK12'}}
+      Person{id='...', name='Timothy Berners-Lee', age=61, address=Address{street='Colehill', city='Wimborne', zip='null'}}
 
 Specify a Query Filter
 ----------------------
@@ -266,28 +196,32 @@ filter objects, the driver provides ``Filters`` helper methods.
 
 .. important::
 
-   When querying POJOs you *must* query against the document field name
+   When querying POJOs, you *must* query against the document field name
    and not the POJO property name. By default, they are the same but it
    is possible to change how POJO property names are mapped.
 
 Get A Single Person That Matches a Filter
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-For example, to find the first ``Person`` in the database that lives in
-``Wimborne``, pass an ``eq()`` filter object to specify the equality
-condition:
+The following example finds the first ``Person`` in the database that
+has an ``address.city`` value of ``Wimborne`` by passing an ``eq()``
+filter object to specify the equality condition:
 
-.. code-block:: java
+.. io-code-block::
+   :copyable: true
 
-   collection.find(eq("address.city", "Wimborne"))
-       .first()
-       .subscribe(new PrintToStringSubscriber<>());
+   .. input::
+      :language: java
 
-The example prints one document:
+      collection.find(eq("address.city", "Wimborne"))
+          .first()
+          .subscribe(new PrintToStringSubscriber<>());
 
-.. code-block:: none
+   .. output::
+      :language: none
+      :visible: false
 
-   Person{id='591dbc2550852fa685b3ad1a', name='Timothy Berners-Lee', age=61, address=Address{street='Colehill', city='Wimborne', zip='null'}}
+      Person{id='591dbc2550852fa685b3ad1a', name='Timothy Berners-Lee', age=61, address=Address{street='Colehill', city='Wimborne', zip='null'}}
 
 Get All Person Instances That Match a Filter
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -305,12 +239,12 @@ Update Documents
 To update documents in a collection, you can use the collection's
 ``updateOne()`` and ``updateMany()`` methods.
 
-Pass the following components to the methods:
+Pass the following parameters to the methods:
 
 - Filter object to determine the document or documents to update. To
   specify an empty filter and match all ``Person`` instances, use an
   empty ``Document`` object.
-- An update document that specifies the modifications. To view a list of
+- Update document that specifies the modifications. To view a list of
   the available operators, see :manual:`Update Operators
   </reference/operator/update/>` in the Server manual.
 
@@ -350,11 +284,12 @@ that have a ``zip`` value:
 Replace a Single Person
 ~~~~~~~~~~~~~~~~~~~~~~~
 
-Another method to change an existing ``Person`` instance is to use
+Another way to change an existing ``Person`` instance is to use
 the ``replaceOne()`` method.
 
 The following example replaces a ``Person`` named ``"Ada Lovelace"``
-with the original ``Person`` instance:
+with the ``Person`` instance referenced by the ``ada`` variable in the
+:ref:`preceding insertOne example <javars-pojo-insertone>`:
 
 .. code-block:: java
 
@@ -378,10 +313,10 @@ Delete a Single Person That Matches a Filter
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 To delete a single ``Person`` that matches a filter, use the
-``deleteOne()`` method:
+``deleteOne()`` method.
 
-The following example deletes one ``Person`` who lives in
-the city ``Wimborne``:
+The following example deletes one ``Person`` that has an
+``address.city`` value of ``Wimborne``:
 
 .. code-block:: java
 
@@ -394,8 +329,8 @@ Delete All Person Instances That Match a Filter
 To delete multiple ``Person`` instances that match a filter, use the
 ``deleteMany()`` method.
 
-The following example deletes all ``Person`` instances that live in
-the city ``London``:
+The following example deletes all ``Person`` instances that have an
+``address.city`` value of ``London``:
 
 .. code-block:: java
 

source/get-started/quickstart.txt

@@ -430,13 +430,13 @@ Update Documents
 To update documents in a collection, you can use the collection's
 ``updateOne()`` and ``updateMany()`` methods.
 
-Pass the following components to the methods:
+Pass the following parameters to the methods:
 
 - Filter object to determine the document or documents to update. To
   facilitate creating filter objects, the driver provides
   ``Filters`` helper methods. To specify an empty filter and match all
   documents in the collection, use an empty ``Document`` object.
-- An update document that specifies the modifications. To view a list of
+- Update document that specifies the modifications. To view a list of
   the available operators, see :manual:`Update Operators
   </reference/operator/update/>` in the Server manual.