diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/model/impl/HibernateOrmBasicTypeMetadata.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/model/impl/HibernateOrmBasicTypeMetadata.java
index f5def96296d..e1b090b7958 100644
--- a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/model/impl/HibernateOrmBasicTypeMetadata.java
+++ b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/model/impl/HibernateOrmBasicTypeMetadata.java
@@ -17,9 +17,6 @@
 import org.hibernate.property.access.spi.Getter;
 
 class HibernateOrmBasicTypeMetadata {
-	private final Class<?> javaClass;
-	private final Map<String, Property> properties;
-	private final Property identifierProperty;
 
 	public static HibernateOrmBasicTypeMetadata create(PersistentClass persistentClass) {
 		Map<String, Property> properties = new HashMap<>();
@@ -44,6 +41,10 @@ private static void collectProperties(Map<String, Property> collected, Iterator<
 		}
 	}
 
+	private final Class<?> javaClass;
+	private final Map<String, Property> properties;
+	private final Property identifierProperty;
+
 	private HibernateOrmBasicTypeMetadata(Class<?> javaClass, Map<String, Property> properties,
 			Property identifierProperty) {
 		this.javaClass = javaClass;