Remove IDEA warnings

DavideD · DavideD · commit bd48c1273a69 · 2025-02-14T11:03:28.000+01:00
A mischellaneous collection of fixes for warnings that
I've noticed working on this issue.
diff --git a/build.gradle b/build.gradle
@@ -73,7 +73,7 @@ subprojects {
     
     ext.publishScript = rootProject.rootDir.absolutePath + '/publish.gradle'
 
-    tasks.withType( JavaCompile ) {
+    tasks.withType( JavaCompile ).configureEach {
         options.encoding = 'UTF-8'
     }
 
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/engine/impl/Cascade.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/engine/impl/Cascade.java
@@ -235,10 +235,7 @@ else if ( action.performOnLazyProperty() && type.isEntityType() ) {
 										false
 								) );
 					}
-					else {
-						// Nothing to do, so just skip cascading to this lazy attribute.
-						continue;
-					}
+					// Nothing to do, so just skip cascading to this lazy attribute.
 				}
 				else {
 					Object child = persister.getValue( parent, i );
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/id/impl/BlockingIdentifierGenerator.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/id/impl/BlockingIdentifierGenerator.java
@@ -5,19 +5,19 @@
  */
 package org.hibernate.reactive.id.impl;
 
+import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+
+import org.hibernate.reactive.id.ReactiveIdentifierGenerator;
+import org.hibernate.reactive.session.ReactiveConnectionSupplier;
+
 import io.vertx.core.Context;
 import io.vertx.core.Vertx;
 import io.vertx.core.net.impl.pool.CombinerExecutor;
 import io.vertx.core.net.impl.pool.Executor;
 import io.vertx.core.net.impl.pool.Task;
 
-import org.hibernate.reactive.id.ReactiveIdentifierGenerator;
-import org.hibernate.reactive.session.ReactiveConnectionSupplier;
-
-import java.util.Objects;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;
-
 import static org.hibernate.reactive.util.impl.CompletionStages.completedFuture;
 
 /**
@@ -138,7 +138,6 @@ public Task execute(GeneratorState state) {
 				// value in the table, so just increment the lo
 				// value and return the next id in the block
 				completedFuture( local ).whenComplete( this::acceptAsReturnValue );
-				return null;
 			}
 			else {
 				nextHiValue( connectionSupplier )
@@ -155,8 +154,8 @@ public Task execute(GeneratorState state) {
 								} );
 							}
 						} );
-				return null;
 			}
+			return null;
 		}
 
 		private void acceptAsReturnValue(final Long aLong, final Throwable throwable) {
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/id/impl/EmulatedSequenceReactiveIdentifierGenerator.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/id/impl/EmulatedSequenceReactiveIdentifierGenerator.java
@@ -19,7 +19,6 @@
 
 import java.util.Properties;
 
-import static org.hibernate.internal.util.config.ConfigurationHelper.getInt;
 import static org.hibernate.internal.util.config.ConfigurationHelper.getString;
 
 /**
@@ -71,16 +70,6 @@ protected String determineSegmentValue(Properties params) {
 		return null;
 	}
 
-	@Override
-	protected int determineInitialValue(Properties params) {
-		return getInt( SequenceStyleGenerator.INITIAL_PARAM, params, SequenceStyleGenerator.DEFAULT_INITIAL_VALUE );
-	}
-
-	@Override
-	protected int determineIncrement(Properties params) {
-		return getInt( SequenceStyleGenerator.INCREMENT_PARAM, params, SequenceStyleGenerator.DEFAULT_INCREMENT_SIZE );
-	}
-
 	@Override
 	protected Object[] updateParameters(long currentValue, long updatedValue) {
 		return new Object[] { updatedValue, currentValue };
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/id/impl/TableReactiveIdentifierGenerator.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/id/impl/TableReactiveIdentifierGenerator.java
@@ -12,8 +12,6 @@
 import org.hibernate.HibernateException;
 import org.hibernate.LockMode;
 import org.hibernate.LockOptions;
-import org.hibernate.boot.model.relational.Database;
-import org.hibernate.boot.model.relational.SqlStringGenerationContext;
 import org.hibernate.dialect.CockroachDialect;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.OracleDialect;
@@ -189,14 +187,6 @@ protected CompletionStage<Long> nextHiValue(ReactiveConnectionSupplier session)
 				} );
 	}
 
-	@Override
-	public void registerExportables(Database database) {
-	}
-
-	@Override
-	public void initialize(SqlStringGenerationContext context) {
-	}
-
 	@Override
 	public Object generate(SharedSessionContractImplementor session, Object object) throws HibernateException {
 		throw new UnsupportedOperationException();
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/loader/ast/internal/ReactiveMultiIdEntityLoaderArrayParam.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/loader/ast/internal/ReactiveMultiIdEntityLoaderArrayParam.java
@@ -65,7 +65,6 @@ public ReactiveMultiIdEntityLoaderArrayParam(
 			EntityMappingType entityDescriptor,
 			SessionFactoryImplementor sessionFactory) {
 		super( entityDescriptor, sessionFactory );
-		final Class<?> arrayClass = createTypedArray( 0 ).getClass();
 		final Class<?> idClass = getIdentifierMapping().getJavaType().getJavaTypeClass();
 		arrayJdbcMapping = resolveArrayJdbcMapping(
 				getIdentifierMapping().getJdbcMapping(),
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/loader/ast/internal/ReactiveSingleIdEntityLoaderProvidedQueryImpl.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/loader/ast/internal/ReactiveSingleIdEntityLoaderProvidedQueryImpl.java
@@ -46,7 +46,7 @@ public EntityMappingType getLoadable() {
 	public CompletionStage<T> load(Object pkValue, LockOptions lockOptions, Boolean readOnly, SharedSessionContractImplementor session) {
 		// noinspection unchecked
 		final QueryImplementor<T> query = namedQueryMemento
-				.toQuery( session, (Class<T>) entityDescriptor.getMappedJavaType().getJavaTypeClass() );
+				.toQuery( session, entityDescriptor.getMappedJavaType().getJavaTypeClass() );
 
 		//noinspection unchecked
 		query.setParameter( (Parameter<Object>) query.getParameters().iterator().next(), pkValue );
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/loader/ast/internal/ReactiveSingleIdLoadPlan.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/loader/ast/internal/ReactiveSingleIdLoadPlan.java
@@ -81,7 +81,7 @@ public CompletionStage<T> load(Object restrictedValue, Object entityInstance, Bo
 				} );
 	}
 
-	private <T> void invokeAfterLoadActions(Callback callback, SharedSessionContractImplementor session, T entity) {
+	private <G> void invokeAfterLoadActions(Callback callback, SharedSessionContractImplementor session, G entity) {
 		if ( entity != null && getLoadable() != null) {
 			callback.invokeAfterLoadActions( entity, (EntityMappingType) getLoadable(), session );
 		}
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveEntityPersister.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveEntityPersister.java
@@ -16,6 +16,7 @@
 import org.hibernate.generator.values.GeneratedValues;
 import org.hibernate.loader.ast.spi.MultiIdLoadOptions;
 import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.reactive.persister.entity.mutation.ReactiveInsertCoordinator;
 
 import jakarta.persistence.metamodel.Attribute;
 
@@ -33,7 +34,7 @@ public interface ReactiveEntityPersister extends EntityPersister {
 	 * @see EntityPersister#insert(Object, Object[], Object, SharedSessionContractImplementor)
 	 */
 	default CompletionStage<GeneratedValues> insertReactive(Object id, Object[] fields, Object object, SharedSessionContractImplementor session) {
-		return insertReactive( id, fields, object, session );
+		return ( (ReactiveInsertCoordinator) getInsertCoordinator() ).reactiveInsert( object, id, fields, session );
 	};
 
 	/**
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/mutation/ReactiveInsertCoordinatorStandard.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/mutation/ReactiveInsertCoordinatorStandard.java
@@ -435,14 +435,12 @@ protected void breakDownJdbcValue(
 		final String tableName = tableDetails.getTableName();
 		tableDetails.getKeyMapping().breakDownKeyJdbcValues(
 				id,
-				(jdbcValue, columnMapping) -> {
-					jdbcValueBindings.bindValue(
-							jdbcValue,
-							tableName,
-							columnMapping.getColumnName(),
-							ParameterUsage.SET
-					);
-				},
+				(jdbcValue, columnMapping) -> jdbcValueBindings.bindValue(
+						jdbcValue,
+						tableName,
+						columnMapping.getColumnName(),
+						ParameterUsage.SET
+				),
 				session
 		);
 	}
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/pool/impl/DefaultSqlClientPool.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/pool/impl/DefaultSqlClientPool.java
@@ -37,7 +37,6 @@
 import io.vertx.sqlclient.spi.Driver;
 
 import static java.util.Collections.singletonList;
-import static java.util.stream.Collectors.toList;
 
 /**
  * A pool of reactive connections backed by a Vert.x {@link Pool}.
@@ -128,7 +127,7 @@ public void injectServices(ServiceRegistryImplementor serviceRegistry) {
 	}
 
 	@Override
-	public void configure(Map configuration) {
+	public void configure(Map<String, Object> configuration) {
 		uri = jdbcUrl( configuration );
 	}
 
@@ -247,7 +246,7 @@ private Driver findDriver(URI uri, ServiceConfigurationError originalError) {
 		if ( selected.size() > 1 ) {
 			List<String> driverClasses = selected.stream()
 					.map( driver -> driver.getClass().getCanonicalName() )
-					.collect( toList() );
+					.toList();
 			throw new ConfigurationException( "Multiple drivers found matching for URI scheme \"" + scheme + "\". Please, pick one: " + driverClasses, originalError );
 		}
 		return selected.get( 0 );
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/pool/impl/DefaultSqlClientPoolConfiguration.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/pool/impl/DefaultSqlClientPoolConfiguration.java
@@ -232,15 +232,15 @@ private int oraclePort(URI uri) {
 			if ( s.indexOf( '/' ) != -1 ) {
 				// Example: 1234/
 				s = s.substring( 0, s.indexOf( '/' ) );
-				return Integer.valueOf( s );
+				return Integer.parseInt( s );
 			}
 			if ( s.indexOf( '?' ) != -1 ) {
 				// Example: 1234?param=value
 				s = s.substring( 0, s.indexOf( '?' ) );
-				return Integer.valueOf( s );
+				return Integer.parseInt( s );
 			}
 			// Example: 1234
-			return Integer.valueOf( s );
+			return Integer.parseInt( s );
 		}
 		return -1;
 	}
@@ -330,7 +330,7 @@ private int extractPort(URI uri) {
 		if ( startOfPort == -1 ) {
 			return -1;
 		}
-		return Integer.valueOf( hostPortString.substring( startOfPort + 1 ) );
+		return Integer.parseInt( hostPortString.substring( startOfPort + 1 ) );
 	}
 
 	private String findHost(URI uri, String scheme) {
@@ -348,7 +348,7 @@ private String findHost(URI uri, String scheme) {
 	}
 
 	private int findPort(URI uri, String scheme) {
-		int port = -1;
+		int port;
 		if ( "oracle".equals( scheme ) ) {
 			port = oraclePort( uri );
 		}
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/pool/impl/ExternalSqlClientPool.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/pool/impl/ExternalSqlClientPool.java
@@ -59,7 +59,7 @@ public final class ExternalSqlClientPool extends SqlClientPool {
 
 	private final Pool pool;
 	private final SqlStatementLogger sqlStatementLogger;
-	private SqlExceptionHelper sqlExceptionHelper;
+	private final SqlExceptionHelper sqlExceptionHelper;
 
 	public ExternalSqlClientPool(Pool pool, SqlStatementLogger sqlStatementLogger, SqlExceptionHelper sqlExceptionHelper) {
 		this.pool = pool;
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/impl/ReactiveIntegrator.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/impl/ReactiveIntegrator.java
@@ -28,7 +28,6 @@
 import org.hibernate.reactive.logging.impl.Log;
 import org.hibernate.reactive.logging.impl.LoggerFactory;
 import org.hibernate.service.ServiceRegistry;
-import org.hibernate.service.spi.SessionFactoryServiceRegistry;
 
 /**
  * Integrates Hibernate Reactive with Hibernate ORM by
@@ -47,10 +46,6 @@ public void integrate(Metadata metadata, BootstrapContext bootstrapContext, Sess
 		attachEventContextManagingListenersIfRequired( sessionFactory.getServiceRegistry() );
 	}
 
-	@Override
-	public void disintegrate(SessionFactoryImplementor sessionFactory, SessionFactoryServiceRegistry serviceRegistry) {
-	}
-
 	private void attachEventContextManagingListenersIfRequired(ServiceRegistry serviceRegistry) {
 		if ( ReactiveModeCheck.isReactiveRegistry( serviceRegistry ) ) {
 			LOG.startHibernateReactive();
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/service/AbstractReactiveInformationSchemaBasedExtractorImpl.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/service/AbstractReactiveInformationSchemaBasedExtractorImpl.java
@@ -192,7 +192,7 @@ protected boolean appendClauseAndParameterIfNotNullOrEmpty(
 			StringBuilder sb,
 			List<Object> parameters) {
 
-		if ( parameter != null && ( ! String.class.isInstance( parameter ) || ! ( (String) parameter ).isEmpty() ) ) {
+		if ( parameter != null && ( !( parameter instanceof String string ) || !string.isEmpty() ) ) {
 			parameters.add( parameter );
 			sb.append( clause );
 			sb.append( parameterMarker( parameters.size() ) );
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/service/MySqlReactiveInformationExtractorImpl.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/service/MySqlReactiveInformationExtractorImpl.java
@@ -46,11 +46,6 @@ protected int dataTypeCode(String typeName) {
 		}
 	}
 
-	@Override
-	protected String getResultSetTableTypesPhysicalTableConstant() {
-		return "BASE TABLE";
-	}
-
 	protected String getDatabaseCatalogColumnName(String catalogColumnName, String schemaColumnName ) {
 		return schemaColumnName;
 	}
@@ -64,7 +59,7 @@ protected <T> T processPrimaryKeysResultSet(
 			String catalogFilter,
 			String schemaFilter,
 			Identifier tableName,
-			ExtractionContext.ResultSetProcessor<T> processor) throws SQLException {
+			ExtractionContext.ResultSetProcessor<T> processor) {
 		// This functionality is not used by ORM.
 		throw new UnsupportedOperationException();
 	}
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/service/PostgreSqlReactiveInformationExtractorImpl.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/service/PostgreSqlReactiveInformationExtractorImpl.java
@@ -32,17 +32,12 @@ public PostgreSqlReactiveInformationExtractorImpl(ExtractionContext extractionCo
 		super( extractionContext );
 	}
 
-	@Override
-	protected String getResultSetTableTypesPhysicalTableConstant() {
-		return "BASE TABLE";
-	}
-
 	@Override
 	protected <T> T processPrimaryKeysResultSet(
 			String catalogFilter,
 			String schemaFilter,
 			Identifier tableName,
-			ExtractionContext.ResultSetProcessor<T> processor) throws SQLException {
+			ExtractionContext.ResultSetProcessor<T> processor) {
 		// This functionality is not used by ORM.
 		throw new UnsupportedOperationException();
 	}
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/service/SqlServerReactiveInformationExtractorImpl.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/service/SqlServerReactiveInformationExtractorImpl.java
@@ -158,7 +158,7 @@ protected <T> T processPrimaryKeysResultSet(
 			String catalogFilter,
 			String schemaFilter,
 			Identifier tableName,
-			ExtractionContext.ResultSetProcessor<T> processor) throws SQLException {
+			ExtractionContext.ResultSetProcessor<T> processor) {
 		throw new UnsupportedOperationException();
 	}
 
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/sql/exec/internal/ReactiveStandardMutationExecutorService.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/sql/exec/internal/ReactiveStandardMutationExecutorService.java
@@ -72,9 +72,8 @@ public MutationExecutor createExecutor(
 	}
 
 	private static GeneratedValuesMutationDelegate generatedValuesDelegate(MutationOperationGroup operationGroup) {
-		GeneratedValuesMutationDelegate generatedValuesMutationDelegate = operationGroup.asEntityMutationOperationGroup() != null
+		return operationGroup.asEntityMutationOperationGroup() != null
 				? operationGroup.asEntityMutationOperationGroup().getMutationDelegate()
 				: null;
-		return generatedValuesMutationDelegate;
 	}
 }
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/sql/results/internal/ReactiveInitializersList.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/sql/results/internal/ReactiveInitializersList.java
@@ -87,7 +87,7 @@ ReactiveInitializersList build(final Map<NavigablePath, Initializer<?>> initiali
 		}
 
 		private Initializer<?>[] toArray(final ArrayList<Initializer<?>> initializers) {
-			return initializers.toArray( new Initializer<?>[initializers.size()] );
+			return initializers.toArray( new Initializer<?>[0] );
 		}
 	}
 }
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/sql/results/spi/ReactiveListResultsConsumer.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/sql/results/spi/ReactiveListResultsConsumer.java
@@ -284,8 +284,7 @@ public boolean addUnique(R result) {
 		}
 
 		public boolean add(R result) {
-			results.add( result );
-			return true;
+			return results.add( result );
 		}
 
 		public List<R> getResults() {
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/util/impl/CompletionStages.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/util/impl/CompletionStages.java
@@ -301,7 +301,7 @@ public R getResult() throws T {
 			if ( throwable == null ) {
 				return result;
 			}
-			throw (T) throwable;
+			throw throwable;
 		}
 
 		public CompletionStage<R> getResultAsCompletionStage() {
@@ -467,7 +467,7 @@ public static CompletionStage<Void> loop(int start, int end, IntPredicate filter
 	}
 
 	public static CompletionStage<Void> whileLoop(Supplier<CompletionStage<Boolean>> loopSupplier) {
-		return asyncWhile( loopSupplier::get );
+		return asyncWhile( loopSupplier );
 	}
 
 	public static CompletionStage<Void> whileLoop(Supplier<Boolean> whileCondition, Supplier<CompletionStage<?>> loopSupplier) {
diff --git a/hibernate-reactive-core/src/test/java/org/hibernate/reactive/types/Json.java b/hibernate-reactive-core/src/test/java/org/hibernate/reactive/types/Json.java
@@ -61,7 +61,7 @@ public void nullSafeSet(PreparedStatement st, JsonObject value, int index, Share
 
 	@Override
 	public JsonObject deepCopy(JsonObject value) {
-		return value == null ? null : ( (JsonObject) value ).copy();
+		return value == null ? null : value.copy();
 	}
 
 	@Override

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ subprojects {`
`73`	`73`
`74`	`74`	`ext.publishScript = rootProject.rootDir.absolutePath + '/publish.gradle'`
`75`	`75`
`76`		`- tasks.withType( JavaCompile ) {`
	`76`	`+ tasks.withType( JavaCompile ).configureEach {`
`77`	`77`	`options.encoding = 'UTF-8'`
`78`	`78`	`}`
`79`	`79`
Original file line number	Diff line number	Diff line change
`@@ -235,10 +235,7 @@ else if ( action.performOnLazyProperty() && type.isEntityType() ) {`
`235`	`235`	`false`
`236`	`236`	`) );`
`237`	`237`	`}`
`238`		`- else {`
`239`		`- // Nothing to do, so just skip cascading to this lazy attribute.`
`240`		`- continue;`
`241`		`- }`
	`238`	`+ // Nothing to do, so just skip cascading to this lazy attribute.`
`242`	`239`	`}`
`243`	`240`	`else {`
`244`	`241`	`Object child = persister.getValue( parent, i );`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public CompletionStage<T> load(Object restrictedValue, Object entityInstance, Bo`
`81`	`81`	`} );`
`82`	`82`	`}`
`83`	`83`
`84`		`- private <T> void invokeAfterLoadActions(Callback callback, SharedSessionContractImplementor session, T entity) {`
	`84`	`+ private <G> void invokeAfterLoadActions(Callback callback, SharedSessionContractImplementor session, G entity) {`
`85`	`85`	`if ( entity != null && getLoadable() != null) {`
`86`	`86`	`callback.invokeAfterLoadActions( entity, (EntityMappingType) getLoadable(), session );`
`87`	`87`	`}`