HSEARCH-5369 Cleanup unnecessary SuppressWarnings

marko-bekhta · marko-bekhta · commit 0c3c3acecac8 · 2025-04-29T08:51:36.000+02:00
diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/lowlevel/directory/impl/FileSystemAccessStrategy.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/lowlevel/directory/impl/FileSystemAccessStrategy.java
@@ -37,7 +37,6 @@ public FSDirectory createDirectory(Path indexDir, LockFactory factory) throws IO
 
 	public abstract FSDirectory createDirectory(Path indexDir, LockFactory factory) throws IOException;
 
-	@SuppressWarnings("deprecation")
 	public static FileSystemAccessStrategy get(FileSystemAccessStrategyName name) {
 		switch ( name ) {
 			case AUTO:
diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/lowlevel/directory/impl/LocalFileSystemDirectoryProvider.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/lowlevel/directory/impl/LocalFileSystemDirectoryProvider.java
@@ -37,7 +37,6 @@ public class LocalFileSystemDirectoryProvider implements DirectoryProvider {
 					.build();
 
 	@Override
-	@SuppressWarnings("deprecation")
 	public DirectoryHolder createDirectoryHolder(DirectoryCreationContext context) {
 		ConfigurationPropertySource propertySource = context.configurationPropertySource();
 		Path directoryRoot = ROOT.get( propertySource ).toAbsolutePath();
diff --git a/build/config/src/main/java/org/hibernate/search/build/report/loggers/LoggerCategoriesProcessor.java b/build/config/src/main/java/org/hibernate/search/build/report/loggers/LoggerCategoriesProcessor.java
@@ -9,7 +9,6 @@
 import java.io.Writer;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
diff --git a/engine/src/main/java/org/hibernate/search/engine/search/projection/dsl/impl/HighlightProjectionOptionsStepImpl.java b/engine/src/main/java/org/hibernate/search/engine/search/projection/dsl/impl/HighlightProjectionOptionsStepImpl.java
@@ -32,7 +32,7 @@ public HighlightProjectionOptionsStep highlighter(String highlighterName) {
 		return this;
 	}
 
-	@SuppressWarnings("deprecation")
+	@Deprecated(since = "8.0")
 	@Override
 	public SingleHighlightProjectionFinalStep single() {
 		return new SingleHighlightProjectionFinalStepImpl();
diff --git a/engine/src/main/java/org/hibernate/search/engine/search/projection/spi/ListBasedProjectionCollector.java b/engine/src/main/java/org/hibernate/search/engine/search/projection/spi/ListBasedProjectionCollector.java
@@ -18,7 +18,6 @@
  * @param <V> The type of values to accumulate obtained by transforming extracted values ({@code E}).
  * @param <R> The type of the final result containing values of type {@code V}.
  */
-@SuppressWarnings("deprecation")
 abstract class ListBasedProjectionCollector<E, V, R>
 		implements ProjectionCollector<E, V, List<Object>, R> {
 
diff --git a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/projection/AbstractDistanceProjectionMultiValuedBaseIT.java b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/projection/AbstractDistanceProjectionMultiValuedBaseIT.java
@@ -153,7 +153,6 @@ void simple(TestedFieldStructure fieldStructure, DataSet dataSet) {
 	/**
 	 * Test that mentioning the same projection twice works as expected.
 	 */
-	@SuppressWarnings("unchecked")
 	@ParameterizedTest(name = "{0}")
 	@MethodSource("params")
 	void duplicated(TestedFieldStructure fieldStructure, DataSet dataSet) {
diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingBasicIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingBasicIT.java
@@ -358,11 +358,10 @@ void sessionClear() {
 	}
 
 	/**
-	 * Test that merging an entity using update() to change an indexed field
+	 * Test that merging an entity using ~update()~ merge() to change an indexed field
 	 * triggers reindexing of the indexed entity owning the property.
 	 */
 	@Test
-	@SuppressWarnings("deprecation") // This is specifically about "update", which is NOT strictly equivalent to "merge"
 	void sessionUpdate_directValueUpdate_indexedField() {
 		with( sessionFactory ).runInTransaction( session -> {
 			IndexedEntity entity1 = new IndexedEntity();
diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/SearchQueryEntityLoadingCacheLookupIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/search/loading/SearchQueryEntityLoadingCacheLookupIT.java
@@ -293,7 +293,6 @@ private void testLoadingCacheLookupExpectingSecondLevelCacheLookup(
 		);
 	}
 
-	@SuppressWarnings({ "unchecked", "deprecation" })
 	private void testLoadingCacheLookup(EntityLoadingCacheLookupStrategy overriddenLookupStrategy,
 			int entityCount,
 			List<Integer> entitiesToPutInSecondLevelCache,
diff --git a/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/depth/PathRespectDepthCaseEmbeddedTest.java b/integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/path/depth/PathRespectDepthCaseEmbeddedTest.java
@@ -7,7 +7,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.platform.launcher.core.LauncherFactory.openSession;
 
 import java.util.List;
 
diff --git a/lucene-next/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/lowlevel/directory/impl/FileSystemAccessStrategy.java b/lucene-next/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/lowlevel/directory/impl/FileSystemAccessStrategy.java
@@ -37,7 +37,6 @@ public FSDirectory createDirectory(Path indexDir, LockFactory factory) throws IO
 
 	public abstract FSDirectory createDirectory(Path indexDir, LockFactory factory) throws IOException;
 
-	@SuppressWarnings("deprecation")
 	public static FileSystemAccessStrategy get(FileSystemAccessStrategyName name) {
 		switch ( name ) {
 			case AUTO:
diff --git a/lucene-next/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/lowlevel/directory/impl/LocalFileSystemDirectoryProvider.java b/lucene-next/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/lowlevel/directory/impl/LocalFileSystemDirectoryProvider.java
@@ -37,7 +37,6 @@ public class LocalFileSystemDirectoryProvider implements DirectoryProvider {
 					.build();
 
 	@Override
-	@SuppressWarnings("deprecation")
 	public DirectoryHolder createDirectoryHolder(DirectoryCreationContext context) {
 		ConfigurationPropertySource propertySource = context.configurationPropertySource();
 		Path directoryRoot = ROOT.get( propertySource ).toAbsolutePath();
diff --git a/mapper/orm-jakarta-batch/core/src/main/java/org/hibernate/search/jakarta/batch/core/massindexing/util/impl/PersistenceUtil.java b/mapper/orm-jakarta-batch/core/src/main/java/org/hibernate/search/jakarta/batch/core/massindexing/util/impl/PersistenceUtil.java
@@ -40,7 +40,6 @@ private PersistenceUtil() {
 	 */
 	public static Session openSession(EntityManagerFactory entityManagerFactory, Object tenantId) {
 		SessionFactory sessionFactory = entityManagerFactory.unwrap( SessionFactory.class );
-		@SuppressWarnings("rawtypes")
 		SessionBuilder builder = sessionFactory.withOptions();
 		if ( tenantId != null ) {
 			builder.tenantIdentifier( tenantId );
diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/bootstrap/impl/HibernateSearchPreIntegrationService.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/bootstrap/impl/HibernateSearchPreIntegrationService.java
@@ -80,8 +80,7 @@ public Class<HibernateSearchPreIntegrationService> getServiceInitiated() {
 		}
 
 		@Override
-		@SuppressWarnings("rawtypes") // Can't do better: Map is raw in the superclass
-		public HibernateSearchPreIntegrationService initiateService(Map configurationValues,
+		public HibernateSearchPreIntegrationService initiateService(Map<String, Object> configurationValues,
 				ServiceRegistryImplementor registry) {
 			// Hibernate ORM may call this method twice if we return a null service.
 			// Make sure we won't log statements multiple times.
@@ -95,11 +94,9 @@ public HibernateSearchPreIntegrationService initiateService(Map configurationVal
 			}
 
 			ConfigurationPropertyChecker propertyChecker = ConfigurationPropertyChecker.create();
-			@SuppressWarnings("unchecked")
 			ConfigurationPropertySource propertySource = propertyChecker.wrap(
 					AllAwareConfigurationPropertySource.fromMap(
-							HibernateOrmUtils.getServiceOrFail( registry, ConfigurationService.class )
-									.getSettings()
+							HibernateOrmUtils.getServiceOrFail( registry, ConfigurationService.class ).getSettings()
 					)
 			);
 
diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/mapping/impl/HibernateOrmMappingConfigurationContributor.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/mapping/impl/HibernateOrmMappingConfigurationContributor.java
@@ -85,7 +85,6 @@ public void configure(MappingBuildContext buildContext, PojoMappingConfiguration
 		}
 	}
 
-	@SuppressWarnings("rawtypes")
 	private void contributeEmbeddableTypeMetadata(
 			MappingConfigurationCollector<PojoTypeMetadataContributor> configurationCollector,
 			Set<PojoRawTypeModel<?>> processedEmbeddableTypes,
diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/model/impl/HibernateOrmPathDefinitionProvider.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/model/impl/HibernateOrmPathDefinitionProvider.java
@@ -30,7 +30,6 @@ public class HibernateOrmPathDefinitionProvider implements PojoPathDefinitionPro
 	private final List<String> propertyStringRepresentationByOrdinal;
 	private final HibernateOrmPathInterpreter interpreter = new HibernateOrmPathInterpreter();
 
-	@SuppressWarnings("unchecked")
 	public HibernateOrmPathDefinitionProvider(PojoRawTypeModel<?> typeModel, PersistentClass persistentClass) {
 		this.typeModel = typeModel;
 		this.persistentClass = persistentClass;
diff --git a/mapper/orm/src/test/java/org/hibernate/search/mapper/orm/HibernateOrmExtensionTest.java b/mapper/orm/src/test/java/org/hibernate/search/mapper/orm/HibernateOrmExtensionTest.java
@@ -88,7 +88,7 @@ void toDocumentFieldValueConverter() {
 	}
 
 	@Test
-	@SuppressWarnings("deprecation")
+	@SuppressWarnings("deprecation") // for ejc
 	void toDocumentValueConverter() {
 		ToDocumentValueConvertContext context = new ToDocumentValueConvertContextImpl( mappingContext );
 		assertThat( context.extension( HibernateOrmExtension.get() ) ).isSameAs( mappingContext );
@@ -103,7 +103,7 @@ void fromDocumentFieldValueConverter() {
 	}
 
 	@Test
-	@SuppressWarnings("deprecation")
+	@SuppressWarnings("deprecation") // for ejc
 	void fromDocumentValueConverter() {
 		FromDocumentValueConvertContext context = new FromDocumentValueConvertContextImpl( sessionContext );
 		assertThat( context.extension( HibernateOrmExtension.get() ) ).isSameAs( sessionContext );
diff --git a/mapper/pojo-base/src/main/java/org/hibernate/search/mapper/pojo/extractor/impl/ContainerExtractorBinder.java b/mapper/pojo-base/src/main/java/org/hibernate/search/mapper/pojo/extractor/impl/ContainerExtractorBinder.java
@@ -336,7 +336,6 @@ else if ( !toMatch.get( toMatchIndex )
 		}
 	}
 
-	@SuppressWarnings({ "rawtypes" }) // Checks are implemented using reflection
 	private static class ExtractorResolutionState<C> {
 
 		private final List<String> extractorNames = new ArrayList<>();
diff --git a/mapper/pojo-base/src/main/java/org/hibernate/search/mapper/pojo/identity/impl/UnconfiguredIdentifierMapping.java b/mapper/pojo-base/src/main/java/org/hibernate/search/mapper/pojo/identity/impl/UnconfiguredIdentifierMapping.java
@@ -30,7 +30,6 @@ public void close() {
 	}
 
 	@Override
-	@SuppressWarnings("unchecked") // We can only cast to the raw type, if I is generic we need an unchecked cast
 	public Object getIdentifier(Object providedId, Supplier<? extends E> entitySupplierOrNull) {
 		if ( providedId != null ) {
 			return providedId;
diff --git a/mapper/pojo-base/src/main/java/org/hibernate/search/mapper/pojo/model/path/PojoModelPath.java b/mapper/pojo-base/src/main/java/org/hibernate/search/mapper/pojo/model/path/PojoModelPath.java
@@ -120,7 +120,6 @@ private void appendPath(StringBuilder builder) {
 		}
 	}
 
-	@SuppressWarnings("rawtypes")
 	public static class Builder {
 
 		private PojoModelPathPropertyNode currentPropertyNode;
diff --git a/mapper/pojo-base/src/main/java/org/hibernate/search/mapper/pojo/search/definition/binding/impl/ProjectionBindingContextImpl.java b/mapper/pojo-base/src/main/java/org/hibernate/search/mapper/pojo/search/definition/binding/impl/ProjectionBindingContextImpl.java
@@ -135,7 +135,7 @@ public <P2, C> void definition(Class<P2> expectedValueType,
 		checkAndBind( definitionHolder, mappingHelper.introspector().typeModel( expectedValueType ) );
 	}
 
-	@SuppressWarnings("deprecation")
+	@Deprecated(since = "8.0")
 	@Override
 	public Optional<MultiContextImpl<?>> multi() {
 		PojoTypeModel<?> boundParameterElement = boundParameterElement( MULTI_EXTRACTORS );
diff --git a/util/common/src/test/java/org/hibernate/search/util/common/jar/impl/CodeSourceTest.java b/util/common/src/test/java/org/hibernate/search/util/common/jar/impl/CodeSourceTest.java
@@ -193,7 +193,6 @@ void jar_jarScheme_springBoot_classesInSubDirectory() throws Exception {
 		} );
 
 		try ( JarFile outerJar = new JarFile( jarPath.toFile() ) ) {
-			@SuppressWarnings("deprecation") // For JDK 20+
 			URL innerJarURL = JarUrl.create( jarPath.toFile(), null, classesDirRelativeString );
 			try ( URLClassLoader isolatedClassLoader = createIsolatedClassLoader( innerJarURL ) ) {
 				Class<?> classInIsolatedClassLoader = isolatedClassLoader.loadClass( SimpleClass.class.getName() );

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public HighlightProjectionOptionsStep highlighter(String highlighterName) {`
`32`	`32`	`return this;`
`33`	`33`	`}`
`34`	`34`
`35`		`- @SuppressWarnings("deprecation")`
	`35`	`+ @Deprecated(since = "8.0")`
`36`	`36`	`@Override`
`37`	`37`	`public SingleHighlightProjectionFinalStep single() {`
`38`	`38`	`return new SingleHighlightProjectionFinalStepImpl();`
Original file line number	Diff line number	Diff line change
`@@ -293,7 +293,6 @@ private void testLoadingCacheLookupExpectingSecondLevelCacheLookup(`
`293`	`293`	`);`
`294`	`294`	`}`
`295`	`295`
`296`		`- @SuppressWarnings({ "unchecked", "deprecation" })`
`297`	`296`	`private void testLoadingCacheLookup(EntityLoadingCacheLookupStrategy overriddenLookupStrategy,`
`298`	`297`	`int entityCount,`
`299`	`298`	`List<Integer> entitiesToPutInSecondLevelCache,`