Skip to content

Commit a40bbc2

Browse files
authored
JAVA-3045: Fix GraalVM native image support for GraalVM 22.2 (#1612)
1 parent f9ced72 commit a40bbc2

File tree

2 files changed

+5
-12
lines changed

2 files changed

+5
-12
lines changed

core/src/main/java/com/datastax/oss/driver/internal/core/protocol/CompressorSubstitutions.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import com.datastax.oss.driver.api.core.context.DriverContext;
2222
import com.datastax.oss.driver.internal.core.util.GraalDependencyChecker;
2323
import com.datastax.oss.protocol.internal.Compressor;
24-
import com.oracle.svm.core.annotate.Delete;
2524
import com.oracle.svm.core.annotate.Substitute;
2625
import com.oracle.svm.core.annotate.TargetClass;
2726
import io.netty.buffer.ByteBuf;
@@ -82,14 +81,6 @@ public static Compressor<ByteBuf> newInstance(String name, DriverContext context
8281
}
8382
}
8483

85-
@TargetClass(value = Lz4Compressor.class, onlyWith = Lz4Missing.class)
86-
@Delete
87-
public static final class DeleteLz4Compressor {}
88-
89-
@TargetClass(value = SnappyCompressor.class)
90-
@Delete
91-
public static final class DeleteSnappyCompressor {}
92-
9384
public static class Lz4Present implements BooleanSupplier {
9485
@Override
9586
public boolean getAsBoolean() {

core/src/main/java/com/datastax/oss/driver/internal/core/util/Dependency.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
*/
1616
package com.datastax.oss.driver.internal.core.util;
1717

18-
import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList;
18+
import java.util.Arrays;
19+
import java.util.Collections;
20+
import java.util.List;
1921

2022
/**
2123
* A set of driver optional dependencies and a common mechanism to test the presence of such
@@ -48,10 +50,10 @@ public enum Dependency {
4850
;
4951

5052
@SuppressWarnings("ImmutableEnumChecker")
51-
private final ImmutableList<String> clzs;
53+
private final List<String> clzs;
5254

5355
Dependency(String... classNames) {
54-
clzs = ImmutableList.copyOf(classNames);
56+
clzs = Collections.unmodifiableList(Arrays.asList(classNames));
5557
}
5658

5759
public Iterable<String> classes() {

0 commit comments

Comments
 (0)