Remove long-deprecated API.

Remove Kotlin extensions accepting KClass and Java API that has been deprecated for removal since the last major revision.

Closes #1594

Author: mp911de

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraKeyspaceExistsException.java

@@ -21,11 +21,14 @@
  * Spring data access exception for Cassandra when a keyspace being created already exists.
  *
  * @author Matthew T. Adams
+ * @author Mark Paluch
  */
 public class CassandraKeyspaceExistsException extends CassandraSchemaElementExistsException {
 
 	private static final @Serial long serialVersionUID = 6032967419751410352L;
 
+	private final String keyspaceName;
+
 	/**
 	 * Constructor for {@link CassandraKeyspaceExistsException}.
 	 *
@@ -34,11 +37,12 @@ public class CassandraKeyspaceExistsException extends CassandraSchemaElementExis
 	 * @param cause the root cause from the underlying data access API.
 	 */
 	public CassandraKeyspaceExistsException(String keyspaceName, String msg, Throwable cause) {
-		super(keyspaceName, ElementType.KEYSPACE, msg, cause);
+		super(msg, cause);
+		this.keyspaceName = keyspaceName;
 	}
 
-	@SuppressWarnings("NullAway")
 	public String getKeyspaceName() {
-		return getElementName();
+		return keyspaceName;
 	}
+
 }

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraReadTimeoutException.java

@@ -43,15 +43,6 @@ public CassandraReadTimeoutException(boolean wasDataPresent, String msg, Throwab
 		this.wasDataPresent = wasDataPresent;
 	}
 
-	/**
-	 * @return whether the actual data was amongst the received replica responses.
-	 * @deprecated since 3.0, use {@link #wasDataPresent()}.
-	 */
-	@Deprecated
-	public boolean getWasDataReceived() {
-		return wasDataPresent();
-	}
-
 	/**
 	 * @return whether the actual data was amongst the received replica responses.
 	 * @since 3.0

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraSchemaElementExistsException.java

@@ -17,7 +17,6 @@
 
 import java.io.Serial;
 
-import org.jspecify.annotations.Nullable;
 import org.springframework.dao.NonTransientDataAccessException;
 
 /**
@@ -30,30 +29,6 @@ public class CassandraSchemaElementExistsException extends NonTransientDataAcces
 
 	private static final @Serial long serialVersionUID = 7798361273692300162L;
 
-	@Deprecated
-	public enum ElementType {
-		KEYSPACE, TABLE, COLUMN, INDEX
-	}
-
-	private @Nullable String elementName;
-	private @Nullable ElementType elementType;
-
-	/**
-	 * Constructor for {@link CassandraSchemaElementExistsException}.
-	 *
-	 * @param elementName the CQL element name.
-	 * @param elementType the CQL element type.
-	 * @param msg the detail message.
-	 * @param cause the root cause from the underlying data access API.
-	 */
-	@Deprecated
-	public CassandraSchemaElementExistsException(String elementName, ElementType elementType, String msg,
-			Throwable cause) {
-		super(msg, cause);
-		this.elementName = elementName;
-		this.elementType = elementType;
-	}
-
 	/**
 	 * Constructor for {@link CassandraSchemaElementExistsException}.
 	 *
@@ -64,14 +39,4 @@ public CassandraSchemaElementExistsException(String msg, Throwable cause) {
 		super(msg, cause);
 	}
 
-	@Deprecated
-	public @Nullable String getElementName() {
-		return elementName;
-	}
-
-	@Deprecated
-	public @Nullable ElementType getElementType() {
-		return elementType;
-	}
-
 }

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraTableExistsException.java

@@ -21,10 +21,12 @@
  * Spring data access exception for when a Cassandra table being created already exists.
  *
  * @author Matthew T. Adams
+ * @author Mark Paluch
  */
 public class CassandraTableExistsException extends CassandraSchemaElementExistsException {
 
 	private static final @Serial long serialVersionUID = 6032967419751410352L;
+	private final String tableName;
 
 	/**
 	 * Constructor for {@link CassandraTableExistsException}.
@@ -34,11 +36,12 @@ public class CassandraTableExistsException extends CassandraSchemaElementExistsE
 	 * @param cause the root cause from the underlying data access API.
 	 */
 	public CassandraTableExistsException(String tableName, String msg, Throwable cause) {
-		super(tableName, ElementType.TABLE, msg, cause);
+		super(tableName, cause);
+		this.tableName = tableName;
 	}
 
-	@SuppressWarnings("NullAway")
 	public String getTableName() {
-		return getElementName();
+		return tableName;
 	}
+
 }

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/AbstractCassandraConfiguration.java

@@ -33,7 +33,6 @@
 import org.springframework.data.cassandra.core.convert.MappingCassandraConverter;
 import org.springframework.data.cassandra.core.cql.session.init.KeyspacePopulator;
 import org.springframework.data.cassandra.core.mapping.CassandraMappingContext;
-import org.springframework.data.cassandra.core.mapping.SimpleTupleTypeFactory;
 import org.springframework.data.cassandra.core.mapping.SimpleUserTypeResolver;
 import org.springframework.data.cassandra.core.mapping.Table;
 import org.springframework.data.cassandra.core.mapping.UserTypeResolver;
@@ -94,17 +93,6 @@ public CassandraManagedTypes cassandraManagedTypes() throws ClassNotFoundExcepti
 		return CassandraManagedTypes.fromIterable(getInitialEntitySet());
 	}
 
-	/**
-	 * Return the {@link MappingContext} instance to map Entities to {@link Object Java Objects}.
-	 *
-	 * @see org.springframework.data.cassandra.core.mapping.CassandraMappingContext
-	 * @deprecated since 4.0, use {@link #cassandraMappingContext(CassandraManagedTypes)} instead.
-	 */
-	@Deprecated(since = "4.0", forRemoval = true)
-	public CassandraMappingContext cassandraMapping() throws ClassNotFoundException {
-		return cassandraMappingContext(cassandraManagedTypes());
-	}
-
 	/**
 	 * Return the {@link MappingContext} instance to map Entities to {@link Object Java Objects}.
 	 *
@@ -115,15 +103,12 @@ public CassandraMappingContext cassandraMappingContext(CassandraManagedTypes cas
 
 		CqlSession cqlSession = getRequiredSession();
 
-		CassandraMappingContext mappingContext = new CassandraMappingContext(userTypeResolver(cqlSession),
-				SimpleTupleTypeFactory.DEFAULT);
+		CassandraMappingContext mappingContext = new CassandraMappingContext();
 
 		CustomConversions customConversions = requireBeanOfType(CassandraCustomConversions.class);
 
 		getBeanClassLoader().ifPresent(mappingContext::setBeanClassLoader);
 
-		mappingContext.setCodecRegistry(cqlSession.getContext().getCodecRegistry());
-		mappingContext.setCustomConversions(customConversions);
 		mappingContext.setManagedTypes(cassandraManagedTypes);
 		mappingContext.setSimpleTypeHolder(customConversions.getSimpleTypeHolder());
 

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/AbstractCqlTemplateConfiguration.java

@@ -103,18 +103,6 @@ protected <T> T requireBeanOfType(Class<T> beanType) {
 		return getBeanFactory().getBean(beanType);
 	}
 
-	/**
-	 * Returns the {@link String name} of the cluster.
-	 *
-	 * @return the {@link String cluster name}; may be {@literal null}.
-	 * @deprecated since 3.0, use {@link #getSessionName()} instead.
-	 * @since 1.5
-	 */
-	@Deprecated
-	protected @Nullable String getClusterName() {
-		return null;
-	}
-
 	/**
 	 * Return the name of the keyspace to connect to.
 	 *
@@ -249,42 +237,11 @@ protected SessionBuilderConfigurer getSessionBuilderConfigurer() {
 		return null;
 	}
 
-	/**
-	 * Returns the list of CQL scripts to be run on startup after {@link #getKeyspaceCreations() Keyspace creations} and
-	 * after initialization of the {@literal System} Keyspace. return super.getSessionBuilderConfigurer();
-	 *
-	 * @return the list of CQL scripts to be run on startup; may be {@link Collections#emptyList() empty} but never
-	 *         {@literal null}.
-	 * @deprecated since 3.0; Declare a
-	 *             {@link org.springframework.data.cassandra.core.cql.session.init.SessionFactoryInitializer} bean
-	 *             instead.
-	 */
-	@Deprecated
-	protected List<String> getStartupScripts() {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * Returns the list of CQL scripts to be run on shutdown after {@link #getKeyspaceDrops() Keyspace drops}
-	 * and right before shutdown of the {@code System} Keyspace.
-	 *
-	 * @return the list of CQL scripts to be run on shutdown; may be {@link Collections#emptyList() empty}
-	 * but never {@literal null}.
-	 * @deprecated since 3.0; Declare a
-	 * {@link org.springframework.data.cassandra.core.cql.session.init.SessionFactoryInitializer} bean instead.
-	 */
-	@Deprecated
-	protected List<String> getShutdownScripts() {
-		return Collections.emptyList();
-	}
-
 	/**
 	 * Creates a {@link CqlSessionFactoryBean} that provides a Cassandra {@link CqlSession}.
 	 *
 	 * @return the {@link CqlSessionFactoryBean}.
 	 * @see #getKeyspaceName()
-	 * @see #getStartupScripts()
-	 * @see #getShutdownScripts()
 	 */
 	@Bean
 	public CqlSessionFactoryBean cassandraSession() {
@@ -295,8 +252,6 @@ public CqlSessionFactoryBean cassandraSession() {
 		bean.setKeyspaceCreations(getKeyspaceCreations());
 		bean.setKeyspaceDrops(getKeyspaceDrops());
 		bean.setKeyspaceName(getKeyspaceName());
-		bean.setKeyspaceStartupScripts(getStartupScripts());
-		bean.setKeyspaceShutdownScripts(getShutdownScripts());
 		bean.setLocalDatacenter(getLocalDataCenter());
 		bean.setPort(getPort());
 		bean.setSessionBuilderConfigurer(getSessionBuilderConfigurerWrapper());
@@ -318,8 +273,6 @@ private SessionBuilderConfigurer getSessionBuilderConfigurerWrapper() {
 
 				if (StringUtils.hasText(getSessionName())) {
 					options.add(DefaultDriverOption.SESSION_NAME, getSessionName());
-				} else if (StringUtils.hasText(getClusterName())) {
-					options.add(DefaultDriverOption.SESSION_NAME, getClusterName());
 				}
 
 				CompressionType compressionType = getCompressionType();