Replace bulky instanceof casts&assertions with a new more compact MongoAssertions.assertInstanceOf method

stIncMale · stIncMale · commit ed6fb2c4b320 · 2025-06-27T15:14:05.000-06:00
Addresses #95 (comment).
diff --git a/src/main/java/com/mongodb/hibernate/internal/MongoAssertions.java b/src/main/java/com/mongodb/hibernate/internal/MongoAssertions.java
@@ -33,7 +33,7 @@ private MongoAssertions() {}
      */
     public static <T> T assertNotNull(@Nullable T value) throws AssertionError {
         if (value == null) {
-            throw new AssertionError();
+            throw fail();
         }
         return value;
     }
@@ -69,7 +69,7 @@ public static AssertionError fail() throws AssertionError {
      */
     public static void assertNull(@Nullable Object value) throws AssertionError {
         if (value != null) {
-            throw new AssertionError();
+            throw fail();
         }
     }
 
@@ -82,7 +82,7 @@ public static void assertNull(@Nullable Object value) throws AssertionError {
      */
     public static boolean assertTrue(boolean value) throws AssertionError {
         if (!value) {
-            throw new AssertionError();
+            throw fail();
         }
         return true;
     }
@@ -96,8 +96,15 @@ public static boolean assertTrue(boolean value) throws AssertionError {
      */
     public static boolean assertFalse(boolean value) throws AssertionError {
         if (value) {
-            throw new AssertionError();
+            throw fail();
         }
         return false;
     }
+
+    public static <T> T assertInstanceOf(@Nullable Object value, Class<? extends T> type) {
+        if (!type.isInstance(value)) {
+            throw fail();
+        }
+        return type.cast(value);
+    }
 }
diff --git a/src/main/java/com/mongodb/hibernate/internal/cfg/MongoConfigurationBuilder.java b/src/main/java/com/mongodb/hibernate/internal/cfg/MongoConfigurationBuilder.java
@@ -73,15 +73,13 @@ private static final class ConfigPropertiesParser {
             var jdbcUrl = configurationValues.get(JAKARTA_JDBC_URL);
             if (jdbcUrl == null) {
                 return null;
-            }
-            if (jdbcUrl instanceof String jdbcUrlText) {
+            } else if (jdbcUrl instanceof String jdbcUrlText) {
                 return parseConnectionString(JAKARTA_JDBC_URL, jdbcUrlText);
             } else if (jdbcUrl instanceof ConnectionString jdbcUrlConnectionString) {
                 return jdbcUrlConnectionString;
-            } else {
-                throw MongoConfigurationBuilder.ConfigPropertiesParser.Exceptions.unsupportedType(
-                        JAKARTA_JDBC_URL, jdbcUrl, String.class, ConnectionString.class);
             }
+            throw MongoConfigurationBuilder.ConfigPropertiesParser.Exceptions.unsupportedType(
+                    JAKARTA_JDBC_URL, jdbcUrl, String.class, ConnectionString.class);
         }
 
         private static ConnectionString parseConnectionString(String propertyName, String propertyValue) {
diff --git a/src/main/java/com/mongodb/hibernate/internal/type/MongoStructJdbcType.java b/src/main/java/com/mongodb/hibernate/internal/type/MongoStructJdbcType.java
@@ -17,6 +17,7 @@
 package com.mongodb.hibernate.internal.type;
 
 import static com.mongodb.hibernate.internal.MongoAssertions.assertFalse;
+import static com.mongodb.hibernate.internal.MongoAssertions.assertInstanceOf;
 import static com.mongodb.hibernate.internal.MongoAssertions.assertNotNull;
 import static com.mongodb.hibernate.internal.MongoAssertions.assertTrue;
 import static com.mongodb.hibernate.internal.MongoAssertions.fail;
@@ -137,9 +138,7 @@ private BsonValue createBsonValue(@Nullable Object domainValue, WrapperOptions o
             var jdbcMapping = jdbcValueSelectable.getJdbcMapping();
             var jdbcTypeCode = jdbcMapping.getJdbcType().getJdbcTypeCode();
             if (jdbcTypeCode == getJdbcTypeCode()) {
-                if (!(jdbcMapping.getJdbcValueBinder() instanceof Binder<?> structValueBinder)) {
-                    throw fail();
-                }
+                var structValueBinder = assertInstanceOf(jdbcMapping.getJdbcValueBinder(), Binder.class);
                 bsonValue = structValueBinder.getJdbcType().createBsonValue(value, options);
             } else if (jdbcTypeCode == MongoArrayJdbcType.JDBC_TYPE.getVendorTypeNumber()) {
                 @SuppressWarnings("unchecked")
@@ -166,9 +165,7 @@ private BsonValue createBsonValue(@Nullable Object domainValue, WrapperOptions o
             throw new FeatureNotSupportedException(
                     "TODO-HIBERNATE-48 https://jira.mongodb.org/browse/HIBERNATE-48 return null");
         }
-        if (!(rawJdbcValue instanceof BsonDocument bsonDocument)) {
-            throw fail();
-        }
+        var bsonDocument = assertInstanceOf(rawJdbcValue, BsonDocument.class);
         var embeddableMappingType = getEmbeddableMappingType();
         var result = new Object[bsonDocument.size()];
         var elementIdx = 0;
@@ -181,17 +178,12 @@ private BsonValue createBsonValue(@Nullable Object domainValue, WrapperOptions o
                 throw new FeatureNotSupportedException(
                         "TODO-HIBERNATE-48 https://jira.mongodb.org/browse/HIBERNATE-48 domainValue = null");
             } else if (jdbcTypeCode == getJdbcTypeCode()) {
-                if (!(jdbcMapping.getJdbcValueExtractor() instanceof Extractor<?> structValueExtractor)) {
-                    throw fail();
-                }
+                var structValueExtractor = assertInstanceOf(jdbcMapping.getJdbcValueExtractor(), Extractor.class);
                 domainValue = structValueExtractor.getJdbcType().extractJdbcValues(value, options);
             } else if (jdbcTypeCode == MongoArrayJdbcType.JDBC_TYPE.getVendorTypeNumber()) {
-                if (!(jdbcMapping.getJdbcType() instanceof MongoArrayJdbcType arrayJdbcType)) {
-                    throw fail();
-                }
-                if (!(jdbcMapping.getJdbcValueExtractor() instanceof BasicExtractor<?> jdbcValueExtractor)) {
-                    throw fail();
-                }
+                var arrayJdbcType = assertInstanceOf(jdbcMapping.getJdbcType(), MongoArrayJdbcType.class);
+                BasicExtractor<?> jdbcValueExtractor =
+                        assertInstanceOf(jdbcMapping.getJdbcValueExtractor(), BasicExtractor.class);
                 domainValue = arrayJdbcType.getArray(jdbcValueExtractor, toArrayDomainValue(value), options);
             } else {
                 domainValue =
@@ -223,10 +215,7 @@ private final class Binder<X> extends BasicBinder<X> {
 
         @Override
         public MongoStructJdbcType getJdbcType() {
-            if (!(super.getJdbcType() instanceof MongoStructJdbcType structJdbcType)) {
-                throw fail();
-            }
-            return structJdbcType;
+            return assertInstanceOf(super.getJdbcType(), MongoStructJdbcType.class);
         }
 
         @Override
@@ -256,10 +245,7 @@ private final class Extractor<X> extends BasicExtractor<X> {
 
         @Override
         public MongoStructJdbcType getJdbcType() {
-            if (!(super.getJdbcType() instanceof MongoStructJdbcType structJdbcType)) {
-                throw fail();
-            }
-            return structJdbcType;
+            return assertInstanceOf(super.getJdbcType(), MongoStructJdbcType.class);
         }
 
         @Override
diff --git a/src/main/java/com/mongodb/hibernate/internal/type/ValueConversions.java b/src/main/java/com/mongodb/hibernate/internal/type/ValueConversions.java
@@ -82,11 +82,10 @@ public static BsonValue toBsonValue(@Nullable Object value) throws SQLFeatureNot
             return toBsonValue(v);
         } else if (value instanceof Object[] v) {
             return arrayToBsonValue(v);
-        } else {
-            throw new SQLFeatureNotSupportedException(format(
-                    "Value [%s] of type [%s] is not supported",
-                    value, value.getClass().getTypeName()));
         }
+        throw new SQLFeatureNotSupportedException(format(
+                "Value [%s] of type [%s] is not supported",
+                value, value.getClass().getTypeName()));
     }
 
     public static BsonBoolean toBsonValue(boolean value) {
@@ -199,11 +198,10 @@ private static BsonArray arrayToBsonValue(Object value) throws SQLFeatureNotSupp
             return toDomainValue(v);
         } else if (value instanceof BsonArray v && domainType.isArray()) {
             return toDomainValue(v, assertNotNull(domainType.getComponentType()));
-        } else {
-            throw new SQLFeatureNotSupportedException(format(
-                    "Value [%s] of type [%s] is not supported for the domain type [%s]",
-                    value, assertNotNull(value).getClass().getTypeName(), domainType));
         }
+        throw new SQLFeatureNotSupportedException(format(
+                "Value [%s] of type [%s] is not supported for the domain type [%s]",
+                value, assertNotNull(value).getClass().getTypeName(), domainType));
     }
 
     public static boolean isNull(@Nullable Object value) {
diff --git a/src/main/java/com/mongodb/hibernate/jdbc/MongoPreparedStatement.java b/src/main/java/com/mongodb/hibernate/jdbc/MongoPreparedStatement.java
@@ -16,6 +16,7 @@
 
 package com.mongodb.hibernate.jdbc;
 
+import static com.mongodb.hibernate.internal.MongoAssertions.assertInstanceOf;
 import static com.mongodb.hibernate.internal.MongoAssertions.fail;
 import static com.mongodb.hibernate.internal.type.ValueConversions.toBsonValue;
 import static java.lang.String.format;
@@ -187,15 +188,9 @@ public void setObject(int parameterIndex, Object x, int targetSqlType) throws SQ
         checkParameterIndex(parameterIndex);
         BsonValue value;
         if (targetSqlType == ObjectIdJdbcType.MQL_TYPE.getVendorTypeNumber()) {
-            if (!(x instanceof ObjectId v)) {
-                throw fail();
-            }
-            value = toBsonValue(v);
+            value = toBsonValue(assertInstanceOf(x, ObjectId.class));
         } else if (targetSqlType == MongoStructJdbcType.JDBC_TYPE.getVendorTypeNumber()) {
-            if (!(x instanceof BsonDocument v)) {
-                throw fail();
-            }
-            value = v;
+            value = assertInstanceOf(x, BsonDocument.class);
         } else {
             throw new SQLFeatureNotSupportedException(format(
                     "Parameter value [%s] of SQL type [%d] with index [%d] is not supported",

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ private MongoAssertions() {}`
`33`	`33`	`*/`
`34`	`34`	`public static <T> T assertNotNull(@Nullable T value) throws AssertionError {`
`35`	`35`	`if (value == null) {`
`36`		`- throw new AssertionError();`
	`36`	`+ throw fail();`
`37`	`37`	`}`
`38`	`38`	`return value;`
`39`	`39`	`}`
`@@ -69,7 +69,7 @@ public static AssertionError fail() throws AssertionError {`
`69`	`69`	`*/`
`70`	`70`	`public static void assertNull(@Nullable Object value) throws AssertionError {`
`71`	`71`	`if (value != null) {`
`72`		`- throw new AssertionError();`
	`72`	`+ throw fail();`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`
`@@ -82,7 +82,7 @@ public static void assertNull(@Nullable Object value) throws AssertionError {`
`82`	`82`	`*/`
`83`	`83`	`public static boolean assertTrue(boolean value) throws AssertionError {`
`84`	`84`	`if (!value) {`
`85`		`- throw new AssertionError();`
	`85`	`+ throw fail();`
`86`	`86`	`}`
`87`	`87`	`return true;`
`88`	`88`	`}`
`@@ -96,8 +96,15 @@ public static boolean assertTrue(boolean value) throws AssertionError {`
`96`	`96`	`*/`
`97`	`97`	`public static boolean assertFalse(boolean value) throws AssertionError {`
`98`	`98`	`if (value) {`
`99`		`- throw new AssertionError();`
	`99`	`+ throw fail();`
`100`	`100`	`}`
`101`	`101`	`return false;`
`102`	`102`	`}`
	`103`	`+`
	`104`	`+ public static <T> T assertInstanceOf(@Nullable Object value, Class<? extends T> type) {`
	`105`	`+ if (!type.isInstance(value)) {`
	`106`	`+ throw fail();`
	`107`	`+ }`
	`108`	`+ return type.cast(value);`
	`109`	`+ }`
`103`	`110`	`}`