use of var and final in the TypeBinders and AttributeBinders

Author: gavinking

hibernate-core/src/main/java/org/hibernate/binder/internal/AttributeAccessorBinder.java

@@ -24,8 +24,8 @@ public void bind(
 			MetadataBuildingContext buildingContext,
 			PersistentClass persistentClass,
 			Property property) {
-		String value = accessor.value();
-		Class<?> type = accessor.strategy();
+		final String value = accessor.value();
+		final Class<?> type = accessor.strategy();
 		if ( !value.isEmpty() ) {
 			property.setPropertyAccessorName( value );
 		}

hibernate-core/src/main/java/org/hibernate/binder/internal/CollateBinder.java

@@ -23,7 +23,7 @@
 public class CollateBinder implements AttributeBinder<Collate> {
 	@Override
 	public void bind(Collate collate, MetadataBuildingContext context, PersistentClass entity, Property property) {
-		Value value = property.getValue();
+		final Value value = property.getValue();
 		if ( value instanceof OneToMany ) {
 			throw new AnnotationException( "One to many association '" + property.getName()
 					+ "' was annotated '@Collate'");

hibernate-core/src/main/java/org/hibernate/binder/internal/CommentBinder.java

@@ -27,9 +27,9 @@
 public class CommentBinder implements AttributeBinder<Comment>, TypeBinder<Comment> {
 	@Override
 	public void bind(Comment comment, MetadataBuildingContext context, PersistentClass entity, Property property) {
-		String text = comment.value();
-		String on = comment.on();
-		Value value = property.getValue();
+		final String text = comment.value();
+		final String on = comment.on();
+		final Value value = property.getValue();
 		if ( value instanceof OneToMany ) {
 			throw new AnnotationException( "One to many association '" + property.getName()
 					+ "' was annotated '@Comment'");
@@ -64,17 +64,17 @@ else if ( value instanceof Collection collection ) {
 
 	@Override
 	public void bind(Comment comment, MetadataBuildingContext context, PersistentClass entity) {
-		String text = comment.value();
-		String on = comment.on();
-		Table primary = entity.getTable();
+		final String text = comment.value();
+		final String on = comment.on();
+		final Table primary = entity.getTable();
 		// by default, the comment goes on the primary table
 		if ( on.isEmpty() || primary.getName().equalsIgnoreCase( on ) ) {
 			primary.setComment( text );
 		}
 		else {
 			// but if 'on' is explicit, it can go on a secondary table
 			for ( Join join : entity.getJoins() ) {
-				Table secondary = join.getTable();
+				final Table secondary = join.getTable();
 				if ( secondary.getName().equalsIgnoreCase( on ) ) {
 					secondary.setComment( text );
 					return;

hibernate-core/src/main/java/org/hibernate/binder/internal/CommentsBinder.java

@@ -5,7 +5,6 @@
 package org.hibernate.binder.internal;
 
 import org.hibernate.AnnotationException;
-import org.hibernate.annotations.Comment;
 import org.hibernate.annotations.Comments;
 import org.hibernate.binder.AttributeBinder;
 import org.hibernate.binder.TypeBinder;
@@ -25,9 +24,9 @@
 public class CommentsBinder implements TypeBinder<Comments>, AttributeBinder<Comments> {
 	@Override
 	public void bind(Comments comments, MetadataBuildingContext context, PersistentClass entity, Property property) {
-		final CommentBinder commentBinder = new CommentBinder();
+		final var commentBinder = new CommentBinder();
 		final Set<String> ons = new HashSet<>( comments.value().length );
-		for ( Comment comment : comments.value() ) {
+		for ( var comment : comments.value() ) {
 			if ( !ons.add( comment.on() ) ) {
 				throw new AnnotationException( "Multiple '@Comment' annotations of '"
 						+ property.getName() + "' had the same 'on'" );
@@ -38,9 +37,9 @@ public void bind(Comments comments, MetadataBuildingContext context, PersistentC
 
 	@Override
 	public void bind(Comments comments, MetadataBuildingContext context, PersistentClass entity) {
-		final CommentBinder commentBinder = new CommentBinder();
+		final var commentBinder = new CommentBinder();
 		final Set<String> ons = new HashSet<>( comments.value().length );
-		for ( Comment comment : comments.value() ) {
+		for ( var comment : comments.value() ) {
 			if ( !ons.add( comment.on() ) ) {
 				throw new AnnotationException( "Multiple '@Comment' annotations of entity '"
 						+ entity.getEntityName() + "' had the same 'on'" );

hibernate-core/src/main/java/org/hibernate/binder/internal/TenantIdBinder.java

@@ -10,16 +10,13 @@
 import org.hibernate.MappingException;
 import org.hibernate.annotations.TenantId;
 import org.hibernate.binder.AttributeBinder;
-import org.hibernate.boot.spi.InFlightMetadataCollector;
 import org.hibernate.boot.spi.MetadataBuildingContext;
 import org.hibernate.engine.spi.FilterDefinition;
 import org.hibernate.mapping.Column;
 import org.hibernate.mapping.Formula;
 import org.hibernate.mapping.PersistentClass;
 import org.hibernate.mapping.Property;
-import org.hibernate.mapping.Selectable;
 import org.hibernate.metamodel.mapping.JdbcMapping;
-import org.hibernate.type.BasicType;
 import org.hibernate.type.descriptor.java.JavaType;
 
 import static java.util.Collections.emptyMap;
@@ -41,14 +38,14 @@ public void bind(
 			MetadataBuildingContext buildingContext,
 			PersistentClass persistentClass,
 			Property property) {
-		final InFlightMetadataCollector collector = buildingContext.getMetadataCollector();
+		final var collector = buildingContext.getMetadataCollector();
 
 		final String returnedClassName = property.getReturnedClassName();
-		final BasicType<Object> tenantIdType =
+		final var tenantIdType =
 				collector.getTypeConfiguration().getBasicTypeRegistry()
 						.getRegisteredType( returnedClassName );
 
-		final FilterDefinition filterDefinition = collector.getFilterDefinition( FILTER_NAME );
+		final var filterDefinition = collector.getFilterDefinition( FILTER_NAME );
 		if ( filterDefinition == null ) {
 			collector.addFilterDefinition(
 					new FilterDefinition(
@@ -93,7 +90,7 @@ private String columnNameOrFormula(Property property) {
 		if ( property.getColumnSpan() != 1 ) {
 			throw new MappingException( "@TenantId attribute must be mapped to a single column or formula" );
 		}
-		final Selectable selectable = property.getSelectables().get( 0 );
+		final var selectable = property.getSelectables().get( 0 );
 		if ( selectable instanceof Formula formula ) {
 			return formula.getFormula();
 		}