Add ObjectIdFieldTypeIntegrationTests.getById

Author: stIncMale

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

@@ -46,16 +46,28 @@ class ObjectIdFieldTypeIntegrationTests implements SessionFactoryScopeAware {
 
     @Test
     void insert() {
-        var id = new ObjectId(1, 0);
-        sessionFactoryScope.inTransaction(session -> {
-            var item = new Item();
-            item.id = id;
-            session.persist(item);
-        });
-        assertThat(mongoCollection.find()).containsExactly(new BsonDocument(ID_FIELD_NAME, new BsonObjectId(id)));
+        var item = new Item();
+        item.id = new ObjectId(1, 0);
+        item.v = new ObjectId(2, 0);
+        sessionFactoryScope.inTransaction(session -> session.persist(item));
+        assertThat(mongoCollection.find())
+                .containsExactly(new BsonDocument(ID_FIELD_NAME, new BsonObjectId(item.id))
+                        .append("v", new BsonObjectId(item.v)));
     }
 
-    // VAKOTODO add read tests
+    @Test
+    void getById() {
+        var item = new Item();
+        item.id = new ObjectId(1, 0);
+        item.v = new ObjectId(2, 0);
+        sessionFactoryScope.inTransaction(session -> session.persist(item));
+        var loadedItem = sessionFactoryScope.fromTransaction(session -> session.get(Item.class, item.id));
+        assertThat(loadedItem)
+                .isNotNull()
+                .usingRecursiveComparison()
+                .withStrictTypeChecking()
+                .isEqualTo(item);
+    }
 
     @Override
     public void injectSessionFactoryScope(SessionFactoryScope sessionFactoryScope) {
@@ -67,5 +79,7 @@ public void injectSessionFactoryScope(SessionFactoryScope sessionFactoryScope) {
     static class Item {
         @Id
         ObjectId id;
+
+        ObjectId v;
     }
 }

src/main/java/com/mongodb/hibernate/internal/type/ObjectIdJavaType.java

@@ -47,6 +47,9 @@ public <X> X unwrap(ObjectId value, Class<X> type, WrapperOptions options) {
 
     @Override
     public <X> ObjectId wrap(X value, WrapperOptions options) {
+        if (value instanceof ObjectId wrapped) {
+            return wrapped;
+        }
         throw new FeatureNotSupportedException();
     }
 }

src/main/java/com/mongodb/hibernate/jdbc/MongoResultSet.java

@@ -51,6 +51,7 @@
 import java.util.function.Function;
 import org.bson.BsonDocument;
 import org.bson.BsonValue;
+import org.bson.types.ObjectId;
 import org.jspecify.annotations.Nullable;
 
 final class MongoResultSet implements ResultSetAdapter {
@@ -202,10 +203,16 @@ public double getDouble(int columnIndex) throws SQLException {
 
     @Override
     public <T> @Nullable T getObject(int columnIndex, Class<T> type) throws SQLException {
-        // VAKOTODO implement reading and add MongoResultSet tests
+        // VAKOTODO add MongoResultSet tests
         checkClosed();
         checkColumnIndex(columnIndex);
-        throw new SQLFeatureNotSupportedException("To be implemented in scope of Array / Struct tickets");
+        Object value;
+        if (type.equals(ObjectId.class)) {
+            value = getValue(columnIndex, bsonValue -> bsonValue.asObjectId().getValue());
+        } else {
+            throw new SQLFeatureNotSupportedException("To be implemented in scope of Array / Struct tickets");
+        }
+        return type.cast(value);
     }
 
     @Override