You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ni...@apache.org on 2025/09/16 10:28:24 UTC
(ignite-extensions) branch compilation-fix created (now 2f6b0363)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a change to branch compilation-fix
in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git
at 2f6b0363 Various compilation fix after ignite-core refactoring
This branch includes the following new commits:
new 2f6b0363 Various compilation fix after ignite-core refactoring
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(ignite-extensions) 01/01: Various compilation fix after ignite-core refactoring
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch compilation-fix
in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git
commit 2f6b0363a1fd4ab5c0e7cc81e31131dc2c256ddb
Author: Nikolay Izhikov <ni...@apache.org>
AuthorDate: Tue Sep 16 13:25:43 2025 +0300
Various compilation fix after ignite-core refactoring
---
.../ignite/spi/checkpoint/s3/S3CheckpointData.java | 5 +++--
.../s3/encrypt/SymmetricKeyEncryptionService.java | 1 +
.../cache/store/hibernate/CacheHibernateBlobStore.java | 4 ++--
.../connect/serialization/CacheEventDeserializer.java | 3 ++-
.../connect/serialization/CacheEventSerializer.java | 3 ++-
.../examples/spark/IgniteDataFrameWriteExample.scala | 8 ++++----
.../scala/org/apache/ignite/spark/IgniteContext.scala | 16 ++++++++--------
.../ignite/spark/impl/IgniteRelationProvider.scala | 4 ++--
.../apache/ignite/spark/EntityTestAllTypeFields.scala | 1 -
.../org/apache/ignite/spark/IgniteCatalogSpec.scala | 7 +++----
.../spark/IgniteOptimizationAggregationFuncSpec.scala | 5 ++---
.../org/apache/ignite/spark/IgniteOptimizationSpec.scala | 2 +-
.../ignite/spark/IgniteOptimizationSystemFuncSpec.scala | 8 ++++----
.../spark/IgniteSQLDataFrameIgniteSessionWriteSpec.scala | 3 +--
.../ignite/spark/IgniteSQLDataFrameWriteSpec.scala | 4 ++--
.../apache/spark/sql/ignite/IgniteSparkSessionSpec.scala | 2 +-
16 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/modules/aws-ext/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointData.java b/modules/aws-ext/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointData.java
index 788271e1..31a71c62 100644
--- a/modules/aws-ext/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointData.java
+++ b/modules/aws-ext/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointData.java
@@ -19,6 +19,7 @@ package org.apache.ignite.spi.checkpoint.s3;
import java.io.IOException;
import java.io.InputStream;
+import org.apache.ignite.internal.util.GridUnsafe;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
@@ -91,10 +92,10 @@ class S3CheckpointData {
byte[] bytes = new byte[4 + state.length + 8 + 4 + keyBytes.length];
U.intToBytes(state.length, bytes, 0);
- U.arrayCopy(state, 0, bytes, 4, state.length);
+ GridUnsafe.arrayCopy(state, 0, bytes, 4, state.length);
U.longToBytes(expTime, bytes, 4 + state.length);
U.intToBytes(keyBytes.length, bytes, 4 + state.length + 8);
- U.arrayCopy(keyBytes, 0, bytes, 4 + state.length + 8 + 4, keyBytes.length);
+ GridUnsafe.arrayCopy(keyBytes, 0, bytes, 4 + state.length + 8 + 4, keyBytes.length);
return bytes;
}
diff --git a/modules/aws-ext/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/encrypt/SymmetricKeyEncryptionService.java b/modules/aws-ext/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/encrypt/SymmetricKeyEncryptionService.java
index 1b444d76..cb0b72ec 100644
--- a/modules/aws-ext/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/encrypt/SymmetricKeyEncryptionService.java
+++ b/modules/aws-ext/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/encrypt/SymmetricKeyEncryptionService.java
@@ -101,6 +101,7 @@ public class SymmetricKeyEncryptionService implements EncryptionService {
/**
* @param key Cipher Key.
* @param encMode Enc mode see {@link Cipher#ENCRYPT_MODE}, {@link Cipher#DECRYPT_MODE}, etc.
+ * @return Cipher.
*/
public static Cipher createCipher(Key key, int encMode) {
if (key == null)
diff --git a/modules/hibernate-ext/hibernate/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStore.java b/modules/hibernate-ext/hibernate/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStore.java
index 619eabfc..bc5f5030 100644
--- a/modules/hibernate-ext/hibernate/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStore.java
+++ b/modules/hibernate-ext/hibernate/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStore.java
@@ -42,7 +42,7 @@ import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.marshaller.Marshaller;
-import org.apache.ignite.marshaller.jdk.JdkMarshaller;
+import org.apache.ignite.marshaller.Marshallers;
import org.apache.ignite.resources.CacheStoreSessionResource;
import org.apache.ignite.resources.IgniteInstanceResource;
import org.apache.ignite.resources.LoggerResource;
@@ -104,7 +104,7 @@ public class CacheHibernateBlobStore<K, V> extends CacheStoreAdapter<K, V> {
"org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreEntry.hbm.xml";
/** Marshaller. */
- private static final Marshaller marsh = new JdkMarshaller();
+ private static final Marshaller marsh = Marshallers.jdk();
/** Init guard. */
@GridToStringExclude
diff --git a/modules/kafka-ext/src/main/java/org/apache/ignite/stream/kafka/connect/serialization/CacheEventDeserializer.java b/modules/kafka-ext/src/main/java/org/apache/ignite/stream/kafka/connect/serialization/CacheEventDeserializer.java
index 3bcf5fb8..d3fc6ff8 100644
--- a/modules/kafka-ext/src/main/java/org/apache/ignite/stream/kafka/connect/serialization/CacheEventDeserializer.java
+++ b/modules/kafka-ext/src/main/java/org/apache/ignite/stream/kafka/connect/serialization/CacheEventDeserializer.java
@@ -22,6 +22,7 @@ import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.events.CacheEvent;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.marshaller.Marshaller;
+import org.apache.ignite.marshaller.Marshallers;
import org.apache.ignite.marshaller.jdk.JdkMarshaller;
import org.apache.kafka.common.errors.SerializationException;
import org.apache.kafka.common.serialization.Deserializer;
@@ -31,7 +32,7 @@ import org.apache.kafka.common.serialization.Deserializer;
*/
public class CacheEventDeserializer implements Deserializer<CacheEvent> {
/** Marshaller. */
- private static final Marshaller marsh = new JdkMarshaller();
+ private static final Marshaller marsh = Marshallers.jdk();
/** {@inheritDoc} */
@Override public void configure(Map<String, ?> map, boolean b) {
diff --git a/modules/kafka-ext/src/main/java/org/apache/ignite/stream/kafka/connect/serialization/CacheEventSerializer.java b/modules/kafka-ext/src/main/java/org/apache/ignite/stream/kafka/connect/serialization/CacheEventSerializer.java
index bc092562..e9496cc7 100644
--- a/modules/kafka-ext/src/main/java/org/apache/ignite/stream/kafka/connect/serialization/CacheEventSerializer.java
+++ b/modules/kafka-ext/src/main/java/org/apache/ignite/stream/kafka/connect/serialization/CacheEventSerializer.java
@@ -22,6 +22,7 @@ import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.events.CacheEvent;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.marshaller.Marshaller;
+import org.apache.ignite.marshaller.Marshallers;
import org.apache.ignite.marshaller.jdk.JdkMarshaller;
import org.apache.kafka.common.errors.SerializationException;
import org.apache.kafka.common.serialization.Serializer;
@@ -31,7 +32,7 @@ import org.apache.kafka.common.serialization.Serializer;
*/
public class CacheEventSerializer implements Serializer<CacheEvent> {
/** Marshaller. */
- private static final Marshaller marsh = new JdkMarshaller();
+ private static final Marshaller marsh = Marshallers.jdk();
/** {@inheritDoc} */
@Override public void configure(Map<String, ?> map, boolean b) {
diff --git a/modules/spark-ext/examples/src/main/java/org/apache/ignite/examples/spark/IgniteDataFrameWriteExample.scala b/modules/spark-ext/examples/src/main/java/org/apache/ignite/examples/spark/IgniteDataFrameWriteExample.scala
index bc3e5369..e646d289 100644
--- a/modules/spark-ext/examples/src/main/java/org/apache/ignite/examples/spark/IgniteDataFrameWriteExample.scala
+++ b/modules/spark-ext/examples/src/main/java/org/apache/ignite/examples/spark/IgniteDataFrameWriteExample.scala
@@ -17,17 +17,17 @@
package org.apache.ignite.examples.spark
-import java.lang.{Long => JLong, String => JString}
import org.apache.ignite.cache.query.SqlFieldsQuery
import org.apache.ignite.configuration.CacheConfiguration
-import org.apache.ignite.internal.util.IgniteUtils.gridClassLoader
-import org.apache.ignite.{Ignite, Ignition}
-import org.apache.spark.sql.{SaveMode, SparkSession}
+import org.apache.ignite.internal.util.CommonUtils.gridClassLoader
import org.apache.ignite.spark.IgniteDataFrameSettings._
+import org.apache.ignite.{Ignite, Ignition}
import org.apache.logging.log4j.Level
import org.apache.logging.log4j.core.config.Configurator
import org.apache.spark.sql.functions._
+import org.apache.spark.sql.{SaveMode, SparkSession}
+import java.lang.{Long => JLong, String => JString}
import scala.collection.JavaConversions._
/**
diff --git a/modules/spark-ext/spark/src/main/scala/org/apache/ignite/spark/IgniteContext.scala b/modules/spark-ext/spark/src/main/scala/org/apache/ignite/spark/IgniteContext.scala
index 06fe85a2..567abc80 100644
--- a/modules/spark-ext/spark/src/main/scala/org/apache/ignite/spark/IgniteContext.scala
+++ b/modules/spark-ext/spark/src/main/scala/org/apache/ignite/spark/IgniteContext.scala
@@ -20,12 +20,12 @@ package org.apache.ignite.spark
import org.apache.ignite._
import org.apache.ignite.configuration.{CacheConfiguration, IgniteConfiguration}
import org.apache.ignite.internal.IgnitionEx
-import org.apache.ignite.internal.util.IgniteUtils
-import IgniteContext.setIgniteHome
-import org.apache.spark.sql.SQLContext
-import org.apache.spark.SparkContext
+import org.apache.ignite.internal.util.CommonUtils
+import org.apache.ignite.spark.IgniteContext.setIgniteHome
import org.apache.log4j.Logger
+import org.apache.spark.SparkContext
import org.apache.spark.scheduler.{SparkListener, SparkListenerApplicationEnd}
+import org.apache.spark.sql.SQLContext
/**
* Ignite context.
@@ -41,7 +41,7 @@ class IgniteContext(
) extends Serializable {
private val cfgClo = new Once(cfgF)
- private val igniteHome = IgniteUtils.getIgniteHome
+ private val igniteHome = CommonUtils.getIgniteHome
if (!standalone) {
Logging.log.warn("Embedded mode is deprecated and will be discontinued. Consider using standalone mode instead.")
@@ -192,14 +192,14 @@ object IgniteContext {
new IgniteContext(sparkContext, cfgF, standalone)
def setIgniteHome(igniteHome: String): Unit = {
- val home = IgniteUtils.getIgniteHome
+ val home = CommonUtils.getIgniteHome
if (home == null && igniteHome != null) {
Logging.log.info("Setting IGNITE_HOME from driver not as it is not available on this worker: " + igniteHome)
- IgniteUtils.nullifyHomeDirectory()
+ CommonUtils.nullifyHomeDirectory()
- System.setProperty(IgniteSystemProperties.IGNITE_HOME, igniteHome)
+ System.setProperty(IgniteCommonsSystemProperties.IGNITE_HOME, igniteHome)
}
}
}
diff --git a/modules/spark-ext/spark/src/main/scala/org/apache/ignite/spark/impl/IgniteRelationProvider.scala b/modules/spark-ext/spark/src/main/scala/org/apache/ignite/spark/impl/IgniteRelationProvider.scala
index a4f6da1e..33ac121a 100644
--- a/modules/spark-ext/spark/src/main/scala/org/apache/ignite/spark/impl/IgniteRelationProvider.scala
+++ b/modules/spark-ext/spark/src/main/scala/org/apache/ignite/spark/impl/IgniteRelationProvider.scala
@@ -20,7 +20,7 @@ package org.apache.ignite.spark.impl
import org.apache.ignite.IgniteException
import org.apache.ignite.configuration.IgniteConfiguration
import org.apache.ignite.internal.IgnitionEx
-import org.apache.ignite.internal.util.IgniteUtils
+import org.apache.ignite.internal.util.{CommonUtils, IgniteUtils}
import org.apache.ignite.spark.IgniteContext
import org.apache.ignite.spark.IgniteDataFrameSettings._
import org.apache.ignite.spark.impl.QueryHelper.{createTable, dropTable, ensureCreateTableOptions, saveTable}
@@ -218,7 +218,7 @@ class IgniteRelationProvider extends RelationProvider
* @return IgniteContext.
*/
private def igniteContext(params: Map[String, String], sqlCtx: SQLContext): IgniteContext = {
- val igniteHome = IgniteUtils.getIgniteHome
+ val igniteHome = CommonUtils.getIgniteHome
def configProvider: () ⇒ IgniteConfiguration = {
if (params.contains(OPTION_CONFIG_FILE))
diff --git a/modules/spark-ext/spark/src/test/scala/org/apache/ignite/spark/EntityTestAllTypeFields.scala b/modules/spark-ext/spark/src/test/scala/org/apache/ignite/spark/EntityTestAllTypeFields.scala
index 36d82743..116d7475 100644
--- a/modules/spark-ext/spark/src/test/scala/org/apache/ignite/spark/EntityTestAllTypeFields.scala
+++ b/modules/spark-ext/spark/src/test/scala/org/apache/ignite/spark/EntityTestAllTypeFields.scala
@@ -17,7 +17,6 @@
package org.apache.ignite.spark
-import java.lang.Boolean
import java.sql.Timestamp
import java.util.Date
diff --git a/modules/spark-ext/spark/src/test/scala/org/apache/ignite/spark/IgniteCatalogSpec.scala b/modules/spark-ext/spark/src/test/scala/org/apache/ignite/spark/IgniteCatalogSpec.scala
index b7bc500b..148a6660 100644
--- a/modules/spark-ext/spark/src/test/scala/org/apache/ignite/spark/IgniteCatalogSpec.scala
+++ b/modules/spark-ext/spark/src/test/scala/org/apache/ignite/spark/IgniteCatalogSpec.scala
@@ -17,12 +17,10 @@
package org.apache.ignite.spark
-import java.lang.{Long => JLong}
-
import org.apache.ignite.IgniteException
import org.apache.ignite.cache.query.SqlFieldsQuery
import org.apache.ignite.internal.IgnitionEx
-import org.apache.ignite.internal.util.IgniteUtils.{gridClassLoader, resolveIgnitePath}
+import org.apache.ignite.internal.util.CommonUtils.gridClassLoader
import org.apache.ignite.spark.AbstractDataFrameSpec.{DEFAULT_CACHE, EMPLOYEE_CACHE_NAME, TEST_CONFIG_FILE, enclose}
import org.apache.spark.sql.catalyst.catalog.SessionCatalog
import org.apache.spark.sql.ignite.IgniteSparkSession
@@ -30,7 +28,8 @@ import org.apache.spark.sql.types.{LongType, StringType}
import org.junit.Assert.assertEquals
import org.junit.runner.RunWith
import org.scalatestplus.junit.JUnitRunner
-import org.apache.spark.sql.ignite.IgniteSparkSession
+
+import java.lang.{Long => JLong}
/**
* Tests to check Spark Catalog implementation.
diff --git a/modules/spark-ext/spark/src/test/scala/org/apache/ignite/spark/IgniteOptimizationAggregationFuncSpec.scala b/modules/spark-ext/spark/src/test/scala/org/apache/ignite/spark/IgniteOptimizationAggregationFuncSpec.scala
index fd854111..97d4255d 100644
--- a/modules/spark-ext/spark/src/test/scala/org/apache/ignite/spark/IgniteOptimizationAggregationFuncSpec.scala
+++ b/modules/spark-ext/spark/src/test/scala/org/apache/ignite/spark/IgniteOptimizationAggregationFuncSpec.scala
@@ -17,9 +17,6 @@
package org.apache.ignite.spark
-import java.lang.{Double => JDouble, Long => JLong}
-
-import java.lang.{Double => JDouble, Long => JLong}
import org.apache.ignite.Ignite
import org.apache.ignite.cache.query.SqlFieldsQuery
import org.apache.ignite.internal.IgnitionEx
@@ -28,6 +25,8 @@ import org.apache.spark.sql.ignite.IgniteSparkSession
import org.junit.runner.RunWith
import org.scalatestplus.junit.JUnitRunner
+import java.lang.{Double => JDouble, Long => JLong}
+
/**
*/
@RunWith(classOf[JUnitRunner])
diff --git a/modules/spark-ext/spark/src/test/scala/org/apache/ignite/spark/IgniteOptimizationSpec.scala b/modules/spark-ext/spark/src/test/scala/org/apache/ignite/spark/IgniteOptimizationSpec.scala
index 0165529a..35baf10a 100644
--- a/modules/spark-ext/spark/src/test/scala/org/apache/ignite/spark/IgniteOptimizationSpec.scala
+++ b/modules/spark-ext/spark/src/test/scala/org/apache/ignite/spark/IgniteOptimizationSpec.scala
@@ -20,7 +20,7 @@ package org.apache.ignite.spark
import org.apache.ignite.cache.query.annotations.QuerySqlField
import org.apache.ignite.configuration.CacheConfiguration
import org.apache.ignite.internal.IgnitionEx
-import org.apache.ignite.internal.util.IgniteUtils.gridClassLoader
+import org.apache.ignite.internal.util.CommonUtils.gridClassLoader
import org.apache.ignite.spark.AbstractDataFrameSpec.{DEFAULT_CACHE, TEST_CONFIG_FILE, checkOptimizationResult, enclose}
import org.apache.ignite.spark.IgniteDataFrameSettings.{FORMAT_IGNITE, OPTION_TABLE}
import org.apache.spark.sql.functions.lit
diff --git a/modules/spark-ext/spark/src/test/scala/org/apache/ignite/spark/IgniteOptimizationSystemFuncSpec.scala b/modules/spark-ext/spark/src/test/scala/org/apache/ignite/spark/IgniteOptimizationSystemFuncSpec.scala
index 490cb39e..915439c8 100644
--- a/modules/spark-ext/spark/src/test/scala/org/apache/ignite/spark/IgniteOptimizationSystemFuncSpec.scala
+++ b/modules/spark-ext/spark/src/test/scala/org/apache/ignite/spark/IgniteOptimizationSystemFuncSpec.scala
@@ -19,14 +19,14 @@ package org.apache.ignite.spark
import org.apache.ignite.Ignite
import org.apache.ignite.cache.query.SqlFieldsQuery
-import org.apache.spark.sql.ignite.IgniteSparkSession
-import org.junit.runner.RunWith
-
-import java.lang.{Double => JDouble, Long => JLong}
import org.apache.ignite.internal.IgnitionEx
import org.apache.ignite.spark.AbstractDataFrameSpec.{DEFAULT_CACHE, TEST_CONFIG_FILE, checkOptimizationResult, enclose}
+import org.apache.spark.sql.ignite.IgniteSparkSession
+import org.junit.runner.RunWith
import org.scalatestplus.junit.JUnitRunner
+import java.lang.{Long => JLong}
+
/**
*/
@RunWith(classOf[JUnitRunner])
diff --git a/modules/spark-ext/spark/src/test/scala/org/apache/ignite/spark/IgniteSQLDataFrameIgniteSessionWriteSpec.scala b/modules/spark-ext/spark/src/test/scala/org/apache/ignite/spark/IgniteSQLDataFrameIgniteSessionWriteSpec.scala
index 29becf82..3fb1a121 100644
--- a/modules/spark-ext/spark/src/test/scala/org/apache/ignite/spark/IgniteSQLDataFrameIgniteSessionWriteSpec.scala
+++ b/modules/spark-ext/spark/src/test/scala/org/apache/ignite/spark/IgniteSQLDataFrameIgniteSessionWriteSpec.scala
@@ -18,10 +18,9 @@
package org.apache.ignite.spark
import org.apache.ignite.internal.IgnitionEx
-import org.apache.ignite.internal.util.IgniteUtils.gridClassLoader
+import org.apache.ignite.internal.util.CommonUtils.gridClassLoader
import org.apache.ignite.spark.AbstractDataFrameSpec.{TEST_CONFIG_FILE, enclose}
import org.apache.ignite.spark.IgniteDataFrameSettings._
-import org.apache.ignite.testframework.GridTestUtils.resolveIgnitePath
import org.apache.spark.sql.SaveMode
import org.apache.spark.sql.functions._
import org.apache.spark.sql.ignite.IgniteSparkSession
diff --git a/modules/spark-ext/spark/src/test/scala/org/apache/ignite/spark/IgniteSQLDataFrameWriteSpec.scala b/modules/spark-ext/spark/src/test/scala/org/apache/ignite/spark/IgniteSQLDataFrameWriteSpec.scala
index a2e8b5f8..c0120a8b 100644
--- a/modules/spark-ext/spark/src/test/scala/org/apache/ignite/spark/IgniteSQLDataFrameWriteSpec.scala
+++ b/modules/spark-ext/spark/src/test/scala/org/apache/ignite/spark/IgniteSQLDataFrameWriteSpec.scala
@@ -18,15 +18,15 @@
package org.apache.ignite.spark
import org.apache.ignite.IgniteException
-import org.apache.ignite.internal.util.IgniteUtils.gridClassLoader
+import org.apache.ignite.internal.util.CommonUtils.gridClassLoader
import org.apache.ignite.spark.AbstractDataFrameSpec.{PERSON_TBL_NAME, PERSON_TBL_NAME_2, TEST_CONFIG_FILE}
import org.apache.ignite.spark.IgniteDataFrameSettings._
import org.apache.ignite.spark.impl.sqlTableInfo
import org.apache.spark.sql.SaveMode.{Append, Ignore, Overwrite}
+import org.apache.spark.sql.functions._
import org.apache.spark.sql.{DataFrame, SaveMode}
import org.junit.Assert.assertEquals
import org.junit.runner.RunWith
-import org.apache.spark.sql.functions._
import org.scalatestplus.junit.JUnitRunner
/**
diff --git a/modules/spark-ext/spark/src/test/scala/org/apache/spark/sql/ignite/IgniteSparkSessionSpec.scala b/modules/spark-ext/spark/src/test/scala/org/apache/spark/sql/ignite/IgniteSparkSessionSpec.scala
index 99e23180..95d32d1e 100644
--- a/modules/spark-ext/spark/src/test/scala/org/apache/spark/sql/ignite/IgniteSparkSessionSpec.scala
+++ b/modules/spark-ext/spark/src/test/scala/org/apache/spark/sql/ignite/IgniteSparkSessionSpec.scala
@@ -18,7 +18,7 @@
package org.apache.spark.sql.ignite
import org.apache.ignite.internal.IgnitionEx
-import org.apache.ignite.internal.util.IgniteUtils.gridClassLoader
+import org.apache.ignite.internal.util.CommonUtils.gridClassLoader
import org.apache.ignite.spark.AbstractDataFrameSpec
import org.apache.ignite.spark.AbstractDataFrameSpec.{DEFAULT_CACHE, TEST_CONFIG_FILE, enclose}
import org.junit.runner.RunWith