Java/ScalaDoc: Now publishing separate docs per project.

JAVA-3091

Author: rozza

build.gradle

@@ -123,6 +123,11 @@ configure(scalaProjects) {
         scalaCompileOptions.deprecation = false
     }
 
+    if (project.scalaVersion.startsWith("2.13")) {
+        scaladoc {
+            scalaClasspath += files("$rootDir/gradle/scala/lib/scala-ant-2.13.1.jar")
+        }
+    }
 
     tasks.withType(GenerateModuleMetadata) {
         enabled = false

docs/landing/data/releases.toml

@@ -3,7 +3,7 @@ current = "3.12.0"
 [[versions]]
   version = "4.0.0-beta1"
   docs = "./4.0"
-  api = "./4.0/javadoc"
+  api = "./4.0/apidocs"
 
 [[versions]]
   version = "3.12.0"

docs/reference/config.toml

@@ -9,14 +9,6 @@ disableKinds = ["section", "taxonomy", "taxonomyTerm", "404"]
 [blackfriday]
   plainIdAnchors = true
 
-# Update versions in mongodb.toml as well
-[[menu.main]]
-    name = "API Documentation"
-    pre = "<i class='fa fa-file-text-o'></i>"
-    weight = 90
-    identifier = "apiDocs"
-    url = "/javadoc"
-
 [[menu.main]]
     name = "Source Code"
     pre = "<i class='fa fa-github'></i>"

docs/reference/content/apidocs.md

@@ -0,0 +1,19 @@
++++
+date = "2020-01-28T15:50:55Z"
+title = "API Documentation"
+[menu.main]
+  name = "API Documentation"
+  pre = "<i class='fa fa-file-text-o'></i>"
+  weight = 90
+  identifier = "apiDocs"
++++
+
+## API Documentation
+
+The following API documentation is available:
+
+  - [Java Driver]({{< apiref "mongodb-driver-sync" "index.html" >}}) (modern API)
+  - [Java Driver]({{< apiref "mongodb-driver-legacy" "index.html" >}}) (legacy API)
+  - [Java Reactive Streams Driver]({{< apiref "mongodb-driver-reactivestreams" "index.html" >}})
+  - [Scala Driver]({{< apiref "mongo-scala-driver" "index.html" >}})
+  - [Bson]({{< apiref "bson" "index.html" >}}) (The bson layer)

docs/reference/content/bson/codecs.md

@@ -9,10 +9,10 @@ title = "Codec and CodecRegistry"
 
 ## Codec and CodecRegistry
 
-In the last section we saw how to use the [`BsonReader`]({{< apiref "org/bson/BsonReader" >}}) and 
-[`BsonWriter`]({{< apiref "org/bson/BsonWriter" >}}) API to read and write BSON documents.  But writing code at that 
+In the last section we saw how to use the [`BsonReader`]({{< apiref "bson" "org/bson/BsonReader" >}}) and 
+[`BsonWriter`]({{< apiref "bson" "org/bson/BsonWriter" >}}) API to read and write BSON documents.  But writing code at that 
 low a level is tedious and error-prone, so in practice these algorithms are packaged in implementations of the 
-[`Codec`]({{< apiref "org/bson/codecs/Codec" >}}) interface.
+[`Codec`]({{< apiref "bson" "org/bson/codecs/Codec" >}}) interface.
 
 ### Codec
 
@@ -49,9 +49,9 @@ rely on a set of simpler `Codec` implementations for the basic BSON value types.
 
 ### CodecRegistry
 
-A [`CodecRegistry`]({{< apiref "org/bson/codecs/configuration/CodecRegistry" >}}) contains a set of `Codec` instances that are accessed 
+A [`CodecRegistry`]({{< apiref "bson" "org/bson/codecs/configuration/CodecRegistry" >}}) contains a set of `Codec` instances that are accessed 
 according to the Java classes that they encode from and decode to. Instances of `CodecRegistry` are generally created via static factory 
-methods on the [`CodecRegistries`]({{< apiref "org/bson/codecs/configuration/CodecRegistries" >}}) class.  Consider the simplest of these 
+methods on the [`CodecRegistries`]({{< apiref "bson" "org/bson/codecs/configuration/CodecRegistries" >}}) class.  Consider the simplest of these 
 methods, one that takes a list of `Codec`s:
 
 ```java
@@ -74,7 +74,7 @@ construction  of the `Document` `Codec` until after the `CodecRegistry` has been
 
 ### CodecProvider
 
-A [`CodecProvider`]({{< apiref "org/bson/codecs/configuration/CodecProvider" >}}) is a factory for `Codec` instances.  Unlike 
+A [`CodecProvider`]({{< apiref "bson" "org/bson/codecs/configuration/CodecProvider" >}}) is a factory for `Codec` instances.  Unlike 
 `CodecRegistry`, its `get` method takes not only a Class, but also a `CodecRegistry`, allowing a `CodecProvider` implementation to 
 construct `Codec` instances that require a `CodecRegistry` to look up `Codec` instances for the values contained within it.  Consider a 
 `CodecProvider` for the `Document` class:
@@ -105,7 +105,7 @@ abstracted via the `BsonTypeClassMap` class.
 
 ### BsonTypeClassMap
 
-The [`BsonTypeClassMap`]({{< apiref "org/bson/codecs/BsonTypeClassMap" >}}) class simply maps each value in the `BsonType` 
+The [`BsonTypeClassMap`]({{< apiref "bson" "org/bson/codecs/BsonTypeClassMap" >}}) class simply maps each value in the `BsonType` 
 enumeration to a Java class.  It contains a sensible set of default mappings that can easily be changed by passing an a `Map<BsonType, 
 Class<?>>` instance to the constructor with any replacement mappings to apply.  Consider the case where an application wants to decode 
 all BSON DateTime values to an `Instant` instead of the default `Date`:

docs/reference/content/bson/documents.md

@@ -22,7 +22,7 @@ the other values to be lost.
 
 ### BsonDocument
 
-Although generally not needed by users of the high-level driver API, the [`BsonDocument`]({{< apiref "org/bson/BsonDocument" >}}) class is 
+Although generally not needed by users of the high-level driver API, the [`BsonDocument`]({{< apiref "bson" "org/bson/BsonDocument" >}}) class is 
 central to the way that documents are managed internally by the driver.  The `BsonDocument` class can represent dynamically structured 
 documents of any complexity with a type-safe API.  For instance, the document 
 
@@ -42,11 +42,11 @@ new BsonDocument().append("a", new BsonString("MongoDB"))
 
 The type safety comes from `BsonDocument` implementing `Map<String, BsonValue>`, so even built-in types like `int`, `String` and `List` must
 be wrapped in a sub-class of `BsonValue`.  For a complete list of `BsonValue` sub-types, please consult the 
-[`BsonValue`]({{< apiref "org/bson/BsonValue" >}}) API documentation. 
+[`BsonValue`]({{< apiref "bson" "org/bson/BsonValue" >}}) API documentation. 
 
 ### Document
 
-Most applications will use the [`Document`]({{< apiref "org/bson/Document" >}}) class instead.  Like `BsonDocument`, the 
+Most applications will use the [`Document`]({{< apiref "bson" "org/bson/Document" >}}) class instead.  Like `BsonDocument`, the 
 `Document` class can represent dynamically structured documents of any complexity; however, the typing is much looser, as `Document` 
 implements `Map<String, Object>`. As a result, the same document as above can be constructed using the Document class as follows:
 
@@ -79,17 +79,17 @@ reference .
 ### DBObject
 
 Although not recommended for new applications, those upgrading from the 2.x driver series may continue to use the 
-[`DBObject`]({{< apiref "com/mongodb/DBObject" >}}) interface to represent BSON documents.  `DBObject` is similar to Document in that it 
+[`DBObject`]({{< apiref "mongodb-driver-core" "com/mongodb/DBObject" >}}) interface to represent BSON documents.  `DBObject` is similar to Document in that it 
 represents BSON values as `Object`, but it has a few shortcomings that were impossible to overcome:
 
 - it is an interface rather than a class, so it's API can not be extended without breaking binary compatibility
 - it doesn't actually implement `Map<String, Object>`
-- because it is an interface, a separate concrete class called [`BasicDBObject`]({{< apiref "com/mongodb/BasicDBObject" >}}) which 
+- because it is an interface, a separate concrete class called [`BasicDBObject`]({{< apiref "mongodb-driver-core" "com/mongodb/BasicDBObject" >}}) which 
 implements that interface, is required
 
 ### Bson
 
-To tie these all together, the driver contains a small but powerful interface called [`Bson`]({{< apiref "org/bson/conversions/Bson" >}}). 
+To tie these all together, the driver contains a small but powerful interface called [`Bson`]({{< apiref "bson" "org/bson/conversions/Bson" >}}). 
 Any class that represents a BSON document, whether included in the driver itself or from a third party, can implement this interface and 
 can then be used any place in the high-level API where a BSON document is required. The three classes discussed above all implement this 
 interface and so can be used interchangeably based on the needs of a given application.  For example:

docs/reference/content/bson/extended-json.md

@@ -76,7 +76,7 @@ This code snippet will print out MongoDB shell-compatible JSON, which can then b
 
 Often applications have specific requirements on the structure of JSON that is generated from documents stored in MongoDB, where none of
 the modes described above will suffice.   For those situations a `JsonWriterSettings` instance can be customized with an application-provided 
-[`Converter`]({{< apiref "org/bson/json/Converter" >}}) for each BSON type.
+[`Converter`]({{< apiref "bson" "org/bson/json/Converter" >}}) for each BSON type.
 
 Consider a situation where an application wants to output the hex string representation of an ObjectId as a simple JSON string.  Simply 
 register a custom `Converter` with `JsonWriterSettings` for the ObjectId type: