Merge branch 'main' into HIBERNATE-68-new

Author: NathanQingyangXu

.evergreen/static-checks.sh

@@ -13,4 +13,4 @@ echo "mongo-hibernate: static checking ..."
 
 ./gradlew -version
 
-./gradlew --info -x test -x integrationTest clean check compileJava
+./gradlew --info -x test -x integrationTest -x spotlessApply clean check compileJava

src/integrationTest/java/com/mongodb/hibernate/BasicCrudIntegrationTests.java

@@ -210,21 +210,20 @@ void testDynamicUpdate() {
     class SelectTests {
 
         @Test
-        void testGetByPrimaryKeyWithoutNullValueField() {
+        void testFindByPrimaryKeyWithoutNullValueField() {
             var book = new Book();
             book.id = 1;
             book.author = "Marcel Proust";
             book.title = "In Search of Lost Time";
             book.publishYear = 1913;
 
             sessionFactoryScope.inTransaction(session -> session.persist(book));
-
-            var loadedBook = sessionFactoryScope.fromTransaction(session -> session.get(Book.class, 1));
+            var loadedBook = sessionFactoryScope.fromTransaction(session -> session.find(Book.class, 1));
             assertEquals(book, loadedBook);
         }
 
         @Test
-        void testGetByPrimaryKeyWithNullValueField() {
+        void testFindByPrimaryKeyWithNullValueField() {
             var book = new Book();
             book.id = 1;
             book.title = "Brave New World";
@@ -236,8 +235,7 @@ void testGetByPrimaryKeyWithNullValueField() {
             book.publishYear = 1932;
 
             sessionFactoryScope.inTransaction(session -> session.persist(book));
-
-            var loadedBook = sessionFactoryScope.fromTransaction(session -> session.get(Book.class, 1));
+            var loadedBook = sessionFactoryScope.fromTransaction(session -> session.find(Book.class, 1));
             assertEquals(book, loadedBook);
         }
     }

src/integrationTest/java/com/mongodb/hibernate/IdentifierIntegrationTests.java

@@ -95,7 +95,7 @@ void withSpaceAndDotAndMixedCase() {
                 .containsExactly(new BsonDocument()
                         .append(ID_FIELD_NAME, new BsonInt32(item.id))
                         .append(WithSpaceAndDotAndMixedCase.FIELD_NAME, new BsonInt32(item.v)));
-        sessionFactoryScope.inTransaction(session -> session.get(WithSpaceAndDotAndMixedCase.class, item.id));
+        sessionFactoryScope.inTransaction(session -> session.find(WithSpaceAndDotAndMixedCase.class, item.id));
     }
 
     @Test
@@ -106,7 +106,7 @@ void startingAndEndingWithBackticks() {
                 .containsExactly(new BsonDocument()
                         .append(ID_FIELD_NAME, new BsonInt32(item.id))
                         .append(StartingAndEndingWithBackticks.ACTUAL_FIELD_NAME, new BsonInt32(item.v)));
-        sessionFactoryScope.inTransaction(session -> session.get(StartingAndEndingWithBackticks.class, item.id));
+        sessionFactoryScope.inTransaction(session -> session.find(StartingAndEndingWithBackticks.class, item.id));
     }
 
     @Test
@@ -117,7 +117,7 @@ void startingWithBacktick() {
                 .containsExactly(new BsonDocument()
                         .append(ID_FIELD_NAME, new BsonInt32(item.id))
                         .append(StartingWithBacktick.FIELD_NAME, new BsonInt32(item.v)));
-        sessionFactoryScope.inTransaction(session -> session.get(StartingWithBacktick.class, item.id));
+        sessionFactoryScope.inTransaction(session -> session.find(StartingWithBacktick.class, item.id));
     }
 
     @Test
@@ -128,7 +128,7 @@ void endingWithBacktick() {
                 .containsExactly(new BsonDocument()
                         .append(ID_FIELD_NAME, new BsonInt32(item.id))
                         .append(EndingWithBacktick.FIELD_NAME, new BsonInt32(item.v)));
-        sessionFactoryScope.inTransaction(session -> session.get(EndingWithBacktick.class, item.id));
+        sessionFactoryScope.inTransaction(session -> session.find(EndingWithBacktick.class, item.id));
     }
 
     @Test
@@ -139,7 +139,7 @@ void startingAndEndingWithDoubleQuotes() {
                 .containsExactly(new BsonDocument()
                         .append(ID_FIELD_NAME, new BsonInt32(item.id))
                         .append(StartingAndEndingWithDoubleQuotes.ACTUAL_FIELD_NAME, new BsonInt32(item.v)));
-        sessionFactoryScope.inTransaction(session -> session.get(StartingAndEndingWithDoubleQuotes.class, item.id));
+        sessionFactoryScope.inTransaction(session -> session.find(StartingAndEndingWithDoubleQuotes.class, item.id));
     }
 
     @Test
@@ -150,7 +150,7 @@ void startingWithDoubleQuote() {
                 .containsExactly(new BsonDocument()
                         .append(ID_FIELD_NAME, new BsonInt32(item.id))
                         .append(StartingWithDoubleQuote.FIELD_NAME, new BsonInt32(item.v)));
-        sessionFactoryScope.inTransaction(session -> session.get(StartingWithDoubleQuote.class, item.id));
+        sessionFactoryScope.inTransaction(session -> session.find(StartingWithDoubleQuote.class, item.id));
     }
 
     @Test
@@ -161,7 +161,7 @@ void endingWithDoubleQuote() {
                 .containsExactly(new BsonDocument()
                         .append(ID_FIELD_NAME, new BsonInt32(item.id))
                         .append(EndingWithDoubleQuote.FIELD_NAME, new BsonInt32(item.v)));
-        sessionFactoryScope.inTransaction(session -> session.get(EndingWithDoubleQuote.class, item.id));
+        sessionFactoryScope.inTransaction(session -> session.find(EndingWithDoubleQuote.class, item.id));
     }
 
     @Test
@@ -172,7 +172,7 @@ void startingAndEndingWithSquareBrackets() {
                 .containsExactly(new BsonDocument()
                         .append(ID_FIELD_NAME, new BsonInt32(item.id))
                         .append(StartingAndEndingWithSquareBrackets.ACTUAL_FIELD_NAME, new BsonInt32(item.v)));
-        sessionFactoryScope.inTransaction(session -> session.get(StartingAndEndingWithSquareBrackets.class, item.id));
+        sessionFactoryScope.inTransaction(session -> session.find(StartingAndEndingWithSquareBrackets.class, item.id));
     }
 
     @Test
@@ -183,7 +183,7 @@ void startingWithLeftSquareBracket() {
                 .containsExactly(new BsonDocument()
                         .append(ID_FIELD_NAME, new BsonInt32(item.id))
                         .append(StartingWithLeftSquareBracket.FIELD_NAME, new BsonInt32(item.v)));
-        sessionFactoryScope.inTransaction(session -> session.get(StartingWithLeftSquareBracket.class, item.id));
+        sessionFactoryScope.inTransaction(session -> session.find(StartingWithLeftSquareBracket.class, item.id));
     }
 
     @Test
@@ -194,7 +194,7 @@ void endingWithRightSquareBracket() {
                 .containsExactly(new BsonDocument()
                         .append(ID_FIELD_NAME, new BsonInt32(item.id))
                         .append(EndingWithRightSquareBracket.FIELD_NAME, new BsonInt32(item.v)));
-        sessionFactoryScope.inTransaction(session -> session.get(EndingWithRightSquareBracket.class, item.id));
+        sessionFactoryScope.inTransaction(session -> session.find(EndingWithRightSquareBracket.class, item.id));
     }
 
     @Override

src/integrationTest/java/com/mongodb/hibernate/id/ObjectIdAsIdIntegrationTests.java

@@ -62,11 +62,11 @@ void insert() {
     }
 
     @Test
-    void getById() {
+    void findById() {
         var item = new Item();
         item.id = new ObjectId(1, 0);
         sessionFactoryScope.inTransaction(session -> session.persist(item));
-        var loadedItem = sessionFactoryScope.fromTransaction(session -> session.get(Item.class, item.id));
+        var loadedItem = sessionFactoryScope.fromTransaction(session -> session.find(Item.class, item.id));
         assertEquals(item.id, loadedItem.id);
     }
 

src/integrationTest/java/com/mongodb/hibernate/type/ObjectIdIntegrationTests.java

@@ -80,7 +80,7 @@ void insert() {
     }
 
     @Test
-    void getById() {
+    void findById() {
         var item = new Item();
         item.id = 1;
         item.v = new ObjectId(2, 0);
@@ -90,7 +90,7 @@ void getById() {
         item.vNull = new ObjectId();
         item.vExplicitlyAnnotatedNotForThePublic = new ObjectId(3, 4);
         sessionFactoryScope.inTransaction(session -> session.persist(item));
-        var loadedItem = sessionFactoryScope.fromTransaction(session -> session.get(Item.class, item.id));
+        var loadedItem = sessionFactoryScope.fromTransaction(session -> session.find(Item.class, item.id));
         assertEquals(item, loadedItem);
     }