use 'var' in AbstractInformationExtractorImpl

Author: gavinking

hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/AbstractInformationExtractorImpl.java

@@ -1024,12 +1024,12 @@ protected NameSpacePrimaryKeysInformation extractNameSpacePrimaryKeysInformation
 			final String currentPkName = resultSet.getString( getResultSetPrimaryKeyNameLabel() );
 			final Identifier currentPrimaryKeyIdentifier =
 					currentPkName == null ? null : toIdentifier( currentPkName );
-			final TableInformation tableInformation = getTableInformation(
+			final var tableInformation = getTableInformation(
 					resultSet.getString( getResultSetPrimaryKeyCatalogLabel() ),
 					resultSet.getString( getResultSetPrimaryKeySchemaLabel() ),
 					currentTableName
 			);
-			PrimaryKeyInformation primaryKeyInformation =
+			var primaryKeyInformation =
 					primaryKeysInformation.getPrimaryKeyInformation( currentTableName );
 			final List<ColumnInformation> columns;
 			if ( primaryKeyInformation != null ) {
@@ -1162,7 +1162,7 @@ public Iterable<IndexInformation> getIndexes(TableInformation tableInformation)
 									!= DatabaseMetaData.tableIndexStatistic ) {
 								final Identifier indexIdentifier =
 										toIdentifier( resultSet.getString( getResultSetIndexNameLabel() ) );
-								var builder = indexInformationBuilder( builders, indexIdentifier );
+								final var builder = indexInformationBuilder( builders, indexIdentifier );
 								final Identifier columnIdentifier =
 										toIdentifier( resultSet.getString( getResultSetColumnNameLabel() ) );
 								final var columnInformation = tableInformation.getColumn( columnIdentifier );
@@ -1199,12 +1199,15 @@ public Iterable<IndexInformation> getIndexes(TableInformation tableInformation)
 	private static IndexInformationImpl.Builder indexInformationBuilder(
 			Map<Identifier, IndexInformationImpl.Builder> builders,
 			Identifier indexIdentifier) {
-		var builder = builders.get( indexIdentifier );
+		final var builder = builders.get( indexIdentifier );
 		if ( builder == null ) {
-			builder = IndexInformationImpl.builder( indexIdentifier );
-			builders.put( indexIdentifier, builder );
+			final var newBuilder = IndexInformationImpl.builder( indexIdentifier );
+			builders.put( indexIdentifier, newBuilder );
+			return newBuilder;
+		}
+		else {
+			return builder;
 		}
-		return builder;
 	}
 
 	@Override
@@ -1238,7 +1241,7 @@ protected NameSpaceIndexesInformation extractNameSpaceIndexesInformation(ResultS
 		while ( resultSet.next() ) {
 			if ( resultSet.getShort( getResultSetIndexTypeLabel() )
 				!= DatabaseMetaData.tableIndexStatistic ) {
-				final TableInformation tableInformation = getTableInformation(
+				final var tableInformation = getTableInformation(
 						resultSet.getString( getResultSetCatalogLabel() ),
 						resultSet.getString( getResultSetSchemaLabel() ),
 						resultSet.getString( getResultSetTableNameLabel() )
@@ -1266,10 +1269,10 @@ private IndexInformation getOrCreateIndexInformation(
 			NameSpaceIndexesInformation indexesInformation,
 			Identifier indexIdentifier,
 			TableInformation tableInformation) {
-		final List<IndexInformation> indexes =
+		final var indexes =
 				indexesInformation.getIndexesInformation( tableInformation.getName().getTableName().getText() );
 		if ( indexes != null ) {
-			for ( IndexInformation index : indexes ) {
+			for ( var index : indexes ) {
 				if ( indexIdentifier.equals( index.getIndexIdentifier() ) ) {
 					return index;
 				}
@@ -1515,7 +1518,7 @@ protected NameSpaceForeignKeysInformation extractNameSpaceForeignKeysInformation
 		final var foreignKeysInformation = new NameSpaceForeignKeysInformation( getIdentifierHelper() );
 
 		while ( resultSet.next() ) {
-			final TableInformation tableInformation = getTableInformation(
+			final var tableInformation = getTableInformation(
 					resultSet.getString( getResultSetForeignKeyCatalogLabel() ),
 					resultSet.getString( getResultSetForeignKeySchemaLabel() ),
 					resultSet.getString( getResultSetForeignKeyTableLabel() )
@@ -1550,10 +1553,10 @@ private ForeignKeyInformation getOrCreateForeignKeyInformation(
 			NameSpaceForeignKeysInformation foreignKeysInformation,
 			Identifier foreignKeyIdentifier,
 			TableInformation tableInformation) {
-		final List<ForeignKeyInformation> foreignKeys =
+		final var foreignKeys =
 				foreignKeysInformation.getForeignKeysInformation( tableInformation.getName().getTableName().getText() );
 		if ( foreignKeys != null ) {
-			for ( ForeignKeyInformation foreignKey : foreignKeys ) {
+			for ( var foreignKey : foreignKeys ) {
 				if ( foreignKeyIdentifier.equals( foreignKey.getForeignKeyIdentifier() ) ) {
 					return foreignKey;
 				}