Merge branch 'main' into JAVA-5821

rozza · rozza · commit e11931d1ae12 · 2025-04-01T17:05:24.000+01:00
diff --git a/driver-core/src/test/functional/com/mongodb/internal/connection/ClientMetadataHelperProseTest.java b/driver-core/src/test/functional/com/mongodb/internal/connection/ClientMetadataHelperProseTest.java
@@ -47,7 +47,7 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 /**
- * See <a href="https://github.com/mongodb/specifications/blob/master/source/mongodb-handshake/handshake.rst#test-plan">spec</a>
+ * See <a href="https://github.com/mongodb/specifications/blob/master/source/mongodb-handshake/handshake.md#test-plan">spec</a>
  *
  * <p>
  * NOTE: This class also contains tests that aren't categorized as Prose tests.
@@ -175,16 +175,32 @@ public void test08NotLambda() {
                 });
     }
 
+    @Test
+    public void test09ValidContainerAndFaasProvider() {
+        withWrapper()
+                .withEnvironmentVariable("AWS_EXECUTION_ENV", "AWS_Lambda_java8")
+                .withEnvironmentVariable("AWS_REGION", "us-east-2")
+                .withEnvironmentVariable("AWS_LAMBDA_FUNCTION_MEMORY_SIZE", "1024")
+                .withEnvironmentVariable("KUBERNETES_SERVICE_HOST", "1")
+                .run(() -> {
+                    BsonDocument expected = createExpectedClientMetadataDocument(APP_NAME);
+                    expected.put("env", BsonDocument.parse("{'name': 'aws.lambda', 'memory_mb': 1024, 'region': 'us-east-2', 'container': {'orchestrator': 'kubernetes'}}"));
+                    BsonDocument actual = createActualClientMetadataDocument();
+                    assertEquals(expected, actual);
+
+                    performHello();
+                });
+    }
+
     // Additional tests, not specified as prose tests:
 
     @Test
     void testKubernetesMetadataIncluded() {
         withWrapper()
-                .withEnvironmentVariable("AWS_EXECUTION_ENV", "AWS_Lambda_java8")
                 .withEnvironmentVariable("KUBERNETES_SERVICE_HOST", "kubernetes.default.svc.cluster.local")
                 .run(() -> {
                     BsonDocument expected = createExpectedClientMetadataDocument(APP_NAME);
-                    expected.put("env", BsonDocument.parse("{'name': 'aws.lambda', 'container': {'orchestrator': 'kubernetes'}}"));
+                    expected.put("env", BsonDocument.parse("{'container': {'orchestrator': 'kubernetes'}}"));
                     BsonDocument actual = createActualClientMetadataDocument();
                     assertEquals(expected, actual);
 
@@ -199,10 +215,9 @@ void testDockerMetadataIncluded() {
             pathsMockedStatic.when(() -> Files.exists(path)).thenReturn(true);
 
             withWrapper()
-                    .withEnvironmentVariable("AWS_EXECUTION_ENV", "AWS_Lambda_java8")
                     .run(() -> {
                         BsonDocument expected = createExpectedClientMetadataDocument(APP_NAME);
-                        expected.put("env", BsonDocument.parse("{'name': 'aws.lambda', 'container': {'runtime': 'docker'}}"));
+                        expected.put("env", BsonDocument.parse("{'container': {'runtime': 'docker'}}"));
                         BsonDocument actual = createActualClientMetadataDocument();
                         assertEquals(expected, actual);
 
@@ -218,12 +233,10 @@ void testDockerAndKubernetesMetadataIncluded() {
             pathsMockedStatic.when(() -> Files.exists(path)).thenReturn(true);
 
             withWrapper()
-                    .withEnvironmentVariable("AWS_EXECUTION_ENV", "AWS_Lambda_java8")
                     .withEnvironmentVariable("KUBERNETES_SERVICE_HOST", "kubernetes.default.svc.cluster.local")
                     .run(() -> {
                         BsonDocument expected = createExpectedClientMetadataDocument(APP_NAME);
-                        expected.put("env", BsonDocument.parse("{'name': 'aws.lambda', 'container': {'runtime': 'docker', "
-                                + "'orchestrator': 'kubernetes'}}"));
+                        expected.put("env", BsonDocument.parse("{'container': {'runtime': 'docker', 'orchestrator': 'kubernetes'}}"));
                         BsonDocument actual = createActualClientMetadataDocument();
                         assertEquals(expected, actual);
 
diff --git a/driver-core/src/test/resources/unified-test-format/crud/findOne.json b/driver-core/src/test/resources/unified-test-format/crud/findOne.json
@@ -0,0 +1,158 @@
+{
+  "description": "findOne",
+  "schemaVersion": "1.0",
+  "createEntities": [
+    {
+      "client": {
+        "id": "client0",
+        "observeEvents": [
+          "commandStartedEvent"
+        ]
+      }
+    },
+    {
+      "database": {
+        "id": "database0",
+        "client": "client0",
+        "databaseName": "find-tests"
+      }
+    },
+    {
+      "collection": {
+        "id": "collection0",
+        "database": "database0",
+        "collectionName": "coll0"
+      }
+    }
+  ],
+  "initialData": [
+    {
+      "collectionName": "coll0",
+      "databaseName": "find-tests",
+      "documents": [
+        {
+          "_id": 1,
+          "x": 11
+        },
+        {
+          "_id": 2,
+          "x": 22
+        },
+        {
+          "_id": 3,
+          "x": 33
+        },
+        {
+          "_id": 4,
+          "x": 44
+        },
+        {
+          "_id": 5,
+          "x": 55
+        },
+        {
+          "_id": 6,
+          "x": 66
+        }
+      ]
+    }
+  ],
+  "tests": [
+    {
+      "description": "FindOne with filter",
+      "operations": [
+        {
+          "object": "collection0",
+          "name": "findOne",
+          "arguments": {
+            "filter": {
+              "_id": 1
+            }
+          },
+          "expectResult": {
+            "_id": 1,
+            "x": 11
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "find": "coll0",
+                  "filter": {
+                    "_id": 1
+                  },
+                  "batchSize": {
+                    "$$exists": false
+                  },
+                  "limit": 1,
+                  "singleBatch": true
+                },
+                "commandName": "find",
+                "databaseName": "find-tests"
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "FindOne with filter, sort, and skip",
+      "operations": [
+        {
+          "object": "collection0",
+          "name": "findOne",
+          "arguments": {
+            "filter": {
+              "_id": {
+                "$gt": 2
+              }
+            },
+            "sort": {
+              "_id": 1
+            },
+            "skip": 2
+          },
+          "expectResult": {
+            "_id": 5,
+            "x": 55
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "find": "coll0",
+                  "filter": {
+                    "_id": {
+                      "$gt": 2
+                    }
+                  },
+                  "sort": {
+                    "_id": 1
+                  },
+                  "skip": 2,
+                  "batchSize": {
+                    "$$exists": false
+                  },
+                  "limit": 1,
+                  "singleBatch": true
+                },
+                "commandName": "find",
+                "databaseName": "find-tests"
+              }
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/driver-kotlin-coroutine/src/integrationTest/kotlin/com/mongodb/kotlin/client/coroutine/UnifiedCrudTest.kt b/driver-kotlin-coroutine/src/integrationTest/kotlin/com/mongodb/kotlin/client/coroutine/UnifiedCrudTest.kt
@@ -24,7 +24,7 @@ internal class UnifiedCrudTest() : UnifiedTest() {
         @JvmStatic
         @Throws(URISyntaxException::class, IOException::class)
         fun data(): Collection<Arguments>? {
-            return getTestData("crud", true)
+            return getTestData("crud", true, Language.KOTLIN)
         }
     }
 }
diff --git a/driver-kotlin-coroutine/src/integrationTest/kotlin/com/mongodb/kotlin/client/coroutine/UnifiedTest.kt b/driver-kotlin-coroutine/src/integrationTest/kotlin/com/mongodb/kotlin/client/coroutine/UnifiedTest.kt
@@ -39,4 +39,8 @@ internal abstract class UnifiedTest() : JUnifiedTest() {
     ): ClientEncryption {
         TODO("Not yet implemented - JAVA-4896")
     }
+
+    override fun isReactive(): Boolean = true
+
+    override fun getLanguage(): Language = Language.KOTLIN
 }
diff --git a/driver-kotlin-sync/src/integrationTest/kotlin/com/mongodb/kotlin/client/UnifiedCrudTest.kt b/driver-kotlin-sync/src/integrationTest/kotlin/com/mongodb/kotlin/client/UnifiedCrudTest.kt
@@ -24,7 +24,7 @@ internal class UnifiedCrudTest() : UnifiedTest() {
         @JvmStatic
         @Throws(URISyntaxException::class, IOException::class)
         fun data(): Collection<Arguments>? {
-            return getTestData("crud", false)
+            return getTestData("crud", false, Language.KOTLIN)
         }
     }
 }
diff --git a/driver-kotlin-sync/src/integrationTest/kotlin/com/mongodb/kotlin/client/UnifiedTest.kt b/driver-kotlin-sync/src/integrationTest/kotlin/com/mongodb/kotlin/client/UnifiedTest.kt
@@ -39,4 +39,6 @@ internal abstract class UnifiedTest() : JUnifiedTest() {
     ): ClientEncryption {
         TODO("Not yet implemented - JAVA-4896")
     }
+
+    override fun getLanguage(): Language = Language.KOTLIN
 }
diff --git a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/unified/UnifiedReactiveStreamsTest.java b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/unified/UnifiedReactiveStreamsTest.java
@@ -101,6 +101,6 @@ protected void postCleanUp(final TestDef testDef) {
 
     @NonNull
     protected static Collection<Arguments> getTestData(final String directory) {
-        return getTestData(directory, true);
+        return getTestData(directory, true, Language.JAVA);
     }
 }
diff --git a/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedCrudHelper.java b/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedCrudHelper.java
@@ -408,6 +408,11 @@ OperationResult executeFind(final BsonDocument operation) {
         });
     }
 
+    /**
+     * There is no explicit {@code findOne()} method in {@link MongoCollection} class.
+     * Its feature was emulated by {@link FindIterable#first()}, which would close cursor on server
+     * by setting {@code batchSize} and {@code limit} appropriately.
+     */
     OperationResult executeFindOne(final BsonDocument operation) {
         return resultOf(() ->  createFindIterable(operation).first());
     }
diff --git a/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedSyncTest.java b/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedSyncTest.java
@@ -51,6 +51,6 @@ protected ClientEncryption createClientEncryption(final MongoClient keyVaultClie
 
     @NonNull
     protected static Collection<Arguments> getTestData(final String directory) {
-        return getTestData(directory, false);
+        return getTestData(directory, false, Language.JAVA);
     }
 }
diff --git a/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTest.java b/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTest.java
@@ -165,7 +165,7 @@ public Entities getEntities() {
     }
 
     @NonNull
-    protected static Collection<Arguments> getTestData(final String directory, final boolean isReactive) {
+    protected static Collection<Arguments> getTestData(final String directory, final boolean isReactive, final Language language) {
         List<Arguments> data = new ArrayList<>();
 
         for (BsonDocument fileDocument : getSpecTestDocuments(directory)) {
@@ -177,7 +177,7 @@ protected static Collection<Arguments> getTestData(final String directory, final
             for (BsonValue cur : fileDocument.getArray("tests")) {
                 final BsonDocument testDocument = cur.asDocument();
                 String testDescription = testDocument.getString("description").getValue();
-                TestDef testDef = testDef(directory, fileDescription, testDescription, isReactive);
+                TestDef testDef = testDef(directory, fileDescription, testDescription, isReactive, language);
                 applyCustomizations(testDef);
 
                 boolean forceFlaky = testDef.wasAssignedModifier(Modifier.FORCE_FLAKY);
@@ -248,7 +248,7 @@ public void setUp(
         rootContext.getAssertionContext().push(ContextElement.ofTest(definition));
         ignoreExtraEvents = false;
         if (directoryName != null && fileDescription != null && testDescription != null) {
-            testDef = testDef(directoryName, fileDescription, testDescription, isReactive());
+            testDef = testDef(directoryName, fileDescription, testDescription, isReactive(), getLanguage());
             applyCustomizations(testDef);
 
             boolean skip = testDef.wasAssignedModifier(Modifier.SKIP);
@@ -338,6 +338,10 @@ protected boolean isReactive() {
         return false;
     }
 
+    protected Language getLanguage() {
+        return Language.JAVA;
+    }
+
     @ParameterizedTest(name = "{0}")
     @MethodSource("data")
     public void shouldPassAllOutcomes(
@@ -1121,4 +1125,8 @@ protected void ignoreExtraCommandEvents(final boolean ignoreExtraEvents) {
     protected void ignoreExtraEvents() {
         this.ignoreExtraEvents = true;
     }
+
+    public enum Language {
+        JAVA, KOTLIN
+    }
 }
diff --git a/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTestModifications.java b/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTestModifications.java
@@ -153,13 +153,17 @@ public static void applyCustomizations(final TestDef def) {
                 .test("crud", "findOneAndDelete-hint-unacknowledged", "Unacknowledged findOneAndDelete with hint string on 4.4+ server")
                 .test("crud", "findOneAndDelete-hint-unacknowledged", "Unacknowledged findOneAndDelete with hint document on 4.4+ server");
 
+
         def.skipJira("https://jira.mongodb.org/browse/JAVA-5827")
                         .file("crud", "bypassDocumentValidation");
         def.skipNoncompliant("Find with batchSize equal to limit - batchSize is set to limit if limit is smaller")
                         .test("crud", "find", "Find with batchSize equal to limit");
         def.skipNoncompliant("Updates and Replace bulk operations are split in the java driver")
                         .file("crud", "bulkWrite-comment");
 
+        def.skipNoncompliant("https://jira.mongodb.org/browse/JAVA-5838")
+                .when(() -> def.isReactive() && UnifiedTest.Language.KOTLIN.equals(def.getLanguage()))
+                .file("crud", "findOne");
         // gridfs
 
         def.skipDeprecated("contentType is deprecated in GridFS spec, and 4.x Java driver no longer supports it")
@@ -300,24 +304,28 @@ public static void applyCustomizations(final TestDef def) {
 
     private UnifiedTestModifications() {}
 
-    public static TestDef testDef(final String dir, final String file, final String test, final boolean reactive) {
-        return new TestDef(dir, file, test, reactive);
+    public static TestDef testDef(final String dir, final String file, final String test, final boolean reactive,
+            final UnifiedTest.Language language) {
+        return new TestDef(dir, file, test, reactive, language);
     }
 
     public static final class TestDef {
+
         private final String dir;
         private final String file;
         private final String test;
         private final boolean reactive;
+        private final UnifiedTest.Language language;
 
         private final List<Modifier> modifiers = new ArrayList<>();
         private Function<Throwable, Boolean> matchesThrowable;
 
-        private TestDef(final String dir, final String file, final String test, final boolean reactive) {
+        private TestDef(final String dir, final String file, final String test, final boolean reactive, final UnifiedTest.Language language) {
             this.dir = assertNotNull(dir);
             this.file = assertNotNull(file);
             this.test = assertNotNull(test);
             this.reactive = reactive;
+            this.language = assertNotNull(language);
         }
 
         @Override
@@ -409,6 +417,10 @@ public boolean isReactive() {
             return reactive;
         }
 
+        public UnifiedTest.Language getLanguage() {
+            return language;
+        }
+
         public boolean wasAssignedModifier(final Modifier modifier) {
             return this.modifiers.contains(modifier);
         }

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ internal class UnifiedCrudTest() : UnifiedTest() {`
`24`	`24`	`@JvmStatic`
`25`	`25`	`@Throws(URISyntaxException::class, IOException::class)`
`26`	`26`	`fun data(): Collection<Arguments>? {`
`27`		`- return getTestData("crud", true)`
	`27`	`+ return getTestData("crud", true, Language.KOTLIN)`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,4 +39,8 @@ internal abstract class UnifiedTest() : JUnifiedTest() {`
`39`	`39`	`): ClientEncryption {`
`40`	`40`	`TODO("Not yet implemented - JAVA-4896")`
`41`	`41`	`}`
	`42`	`+`
	`43`	`+ override fun isReactive(): Boolean = true`
	`44`	`+`
	`45`	`+ override fun getLanguage(): Language = Language.KOTLIN`
`42`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,4 +39,6 @@ internal abstract class UnifiedTest() : JUnifiedTest() {`
`39`	`39`	`): ClientEncryption {`
`40`	`40`	`TODO("Not yet implemented - JAVA-4896")`
`41`	`41`	`}`
	`42`	`+`
	`43`	`+ override fun getLanguage(): Language = Language.KOTLIN`
`42`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,6 @@ protected void postCleanUp(final TestDef testDef) {`
`101`	`101`
`102`	`102`	`@NonNull`
`103`	`103`	`protected static Collection<Arguments> getTestData(final String directory) {`
`104`		`- return getTestData(directory, true);`
	`104`	`+ return getTestData(directory, true, Language.JAVA);`
`105`	`105`	`}`
`106`	`106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -408,6 +408,11 @@ OperationResult executeFind(final BsonDocument operation) {`
`408`	`408`	`});`
`409`	`409`	`}`
`410`	`410`
	`411`	`+ /**`
	`412`	`+ * There is no explicit {@code findOne()} method in {@link MongoCollection} class.`
	`413`	`+ * Its feature was emulated by {@link FindIterable#first()}, which would close cursor on server`
	`414`	`+ * by setting {@code batchSize} and {@code limit} appropriately.`
	`415`	`+ */`
`411`	`416`	`OperationResult executeFindOne(final BsonDocument operation) {`
`412`	`417`	`return resultOf(() -> createFindIterable(operation).first());`
`413`	`418`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,6 @@ protected ClientEncryption createClientEncryption(final MongoClient keyVaultClie`
`51`	`51`
`52`	`52`	`@NonNull`
`53`	`53`	`protected static Collection<Arguments> getTestData(final String directory) {`
`54`		`- return getTestData(directory, false);`
	`54`	`+ return getTestData(directory, false, Language.JAVA);`
`55`	`55`	`}`
`56`	`56`	`}`