Skip to content

Commit b601b09

Browse files
committed
fix: restore CI on Java 11
1 parent 5c680ae commit b601b09

37 files changed

Lines changed: 70 additions & 62 deletions

core/src/main/java/com/datastax/dse/driver/internal/core/graph/GraphSON2SerdeTP.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ static final class ObjectGraphNodeGraphSON2Serializer extends StdSerializer<Obje
403403

404404
private static final long serialVersionUID = 1L;
405405

406-
protected ObjectGraphNodeGraphSON2Serializer() {
406+
ObjectGraphNodeGraphSON2Serializer() {
407407
super(ObjectGraphNode.class);
408408
}
409409

core/src/main/java/com/datastax/dse/driver/internal/core/insights/InsightsClient.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
import java.nio.ByteBuffer;
6565
import java.time.Duration;
6666
import java.util.Collections;
67-
import java.util.Date;
6867
import java.util.List;
6968
import java.util.Map;
7069
import java.util.Set;
@@ -114,7 +113,7 @@ public static InsightsClient createInsightsClient(
114113
DataCentersFinder dataCentersFinder = new DataCentersFinder();
115114
return new InsightsClient(
116115
driverContext,
117-
() -> new Date().getTime(),
116+
System::currentTimeMillis,
118117
insightsConfiguration,
119118
new PlatformInfoFinder(),
120119
new ReconnectionPolicyInfoFinder(),

core/src/main/java/com/datastax/dse/driver/internal/core/insights/PackageUtil.java

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,13 @@
1818
package com.datastax.dse.driver.internal.core.insights;
1919

2020
import com.datastax.oss.driver.shaded.guava.common.annotations.VisibleForTesting;
21-
import com.datastax.oss.driver.shaded.guava.common.base.Joiner;
22-
import java.util.Arrays;
23-
import java.util.regex.Pattern;
2421

2522
class PackageUtil {
2623
static final String DEFAULT_SPECULATIVE_EXECUTION_PACKAGE =
2724
"com.datastax.oss.driver.internal.core.specex";
2825
static final String DEFAULT_LOAD_BALANCING_PACKAGE =
2926
"com.datastax.oss.driver.internal.core.loadbalancing";
3027
static final String DEFAULT_AUTH_PROVIDER_PACKAGE = "com.datastax.oss.driver.internal.core.auth";
31-
private static final Pattern PACKAGE_SPLIT_REGEX = Pattern.compile("\\.");
32-
private static final Joiner DOT_JOINER = Joiner.on(".");
3328

3429
static String getNamespace(Class<?> tClass) {
3530
String namespace = "";
@@ -61,18 +56,14 @@ private static ClassSettingDetails getClassSettingDetails(
6156

6257
@VisibleForTesting
6358
static String getClassName(String classSetting) {
64-
String[] split = PACKAGE_SPLIT_REGEX.split(classSetting);
65-
if (split.length == 0) {
66-
return "";
67-
}
68-
return split[split.length - 1];
59+
int lastDot = classSetting.lastIndexOf('.');
60+
return lastDot < 0 ? classSetting : classSetting.substring(lastDot + 1);
6961
}
7062

7163
@VisibleForTesting
7264
static String getFullPackageOrDefault(String classSetting, String defaultValue) {
73-
String[] split = PACKAGE_SPLIT_REGEX.split(classSetting);
74-
if (split.length <= 1) return defaultValue;
75-
return DOT_JOINER.join(Arrays.copyOf(split, split.length - 1));
65+
int lastDot = classSetting.lastIndexOf('.');
66+
return lastDot < 0 ? defaultValue : classSetting.substring(0, lastDot);
7667
}
7768

7869
static class ClassSettingDetails {

core/src/main/java/com/datastax/dse/driver/internal/core/insights/PlatformInfoFinder.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import com.datastax.dse.driver.internal.core.insights.schema.InsightsPlatformInfo.CPUS;
2525
import com.datastax.oss.driver.internal.core.os.Native;
2626
import com.datastax.oss.driver.shaded.guava.common.annotations.VisibleForTesting;
27+
import com.datastax.oss.driver.shaded.guava.common.base.Splitter;
2728
import java.io.BufferedReader;
2829
import java.io.IOException;
2930
import java.io.InputStream;
@@ -37,11 +38,10 @@
3738
import java.util.Objects;
3839
import java.util.Properties;
3940
import java.util.function.Function;
40-
import java.util.regex.Pattern;
4141

4242
class PlatformInfoFinder {
4343
private static final String MAVEN_IGNORE_LINE = "The following files have been resolved:";
44-
private static final Pattern DEPENDENCY_SPLIT_REGEX = Pattern.compile(":");
44+
private static final Splitter DEPENDENCY_SPLITTER = Splitter.on(':');
4545
static final String UNVERIFIED_RUNTIME_VERSION = "UNVERIFIED";
4646
private final Function<DependencyFromFile, URL> propertiesUrlProvider;
4747

@@ -197,11 +197,13 @@ private List<DependencyFromFile> extractMavenDependenciesFromFile(InputStream in
197197
}
198198

199199
private DependencyFromFile extractDependencyFromLine(String line) {
200-
String[] split = DEPENDENCY_SPLIT_REGEX.split(line);
201-
if (split.length == 6) { // case for i.e.: com.github.jnr:jffi:jar:native:1.2.16:compile
202-
return new DependencyFromFile(split[0], split[1], split[4], checkIsOptional(split[5]));
200+
List<String> split = DEPENDENCY_SPLITTER.splitToList(line);
201+
if (split.size() == 6) { // case for i.e.: com.github.jnr:jffi:jar:native:1.2.16:compile
202+
return new DependencyFromFile(
203+
split.get(0), split.get(1), split.get(4), checkIsOptional(split.get(5)));
203204
} else { // case for normal: org.ow2.asm:asm:jar:5.0.3:compile
204-
return new DependencyFromFile(split[0], split[1], split[3], checkIsOptional(split[4]));
205+
return new DependencyFromFile(
206+
split.get(0), split.get(1), split.get(3), checkIsOptional(split.get(4)));
205207
}
206208
}
207209

core/src/main/java/com/datastax/dse/driver/internal/core/insights/schema/InsightMetadata.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public boolean equals(Object o) {
6868
}
6969
InsightMetadata that = (InsightMetadata) o;
7070
return Objects.equals(name, that.name)
71-
&& Objects.equals(timestamp, that.timestamp)
71+
&& timestamp == that.timestamp
7272
&& Objects.equals(tags, that.tags)
7373
&& insightType == that.insightType
7474
&& Objects.equals(insightMappingId, that.insightMappingId);

core/src/main/java/com/datastax/dse/driver/internal/core/metadata/schema/DefaultDseAggregateMetadata.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ public boolean isDeterministic() {
6464
}
6565

6666
@Override
67-
@Nullable
6867
public Optional<Boolean> getDeterministic() {
6968
return Optional.ofNullable(deterministic);
7069
}

core/src/main/java/com/datastax/oss/driver/api/core/data/CqlVector.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public static <V> CqlVector<V> newInstance(List<V> list) {
8080
* Create a new CqlVector instance from the specified string representation.
8181
*
8282
* @param str a String representation of a CqlVector
83-
* @param subtypeCodec
83+
* @param subtypeCodec the codec used to parse individual vector elements
8484
* @return a new CqlVector built from the String representation
8585
*/
8686
public static <V> CqlVector<V> from(@NonNull String str, @NonNull TypeCodec<V> subtypeCodec) {

core/src/main/java/com/datastax/oss/driver/api/core/metadata/token/Partitioner.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import java.nio.ByteBuffer;
2020

21-
/** Allows to hash partition key to a @code{Token}. */
21+
/** Allows to hash partition key to a {@code Token}. */
2222
public interface Partitioner {
2323
Token hash(ByteBuffer partitionKey);
2424
}

core/src/main/java/com/datastax/oss/driver/api/core/retry/RetryVerdict.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
* where, and a method that allows the original request to be modified before the retry.
2828
*/
2929
@FunctionalInterface
30+
@SuppressWarnings("ClassInitializationDeadlock")
3031
public interface RetryVerdict {
3132

3233
/** A retry verdict that retries the same request on the same node. */

core/src/main/java/com/datastax/oss/driver/api/core/type/codec/registry/CodecRegistry.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ public interface CodecRegistry {
5757
* but any attempt to {@linkplain MutableCodecRegistry#register(TypeCodec) register new codecs}
5858
* will throw {@link UnsupportedOperationException}.
5959
*/
60+
@SuppressWarnings("ClassInitializationDeadlock")
6061
CodecRegistry DEFAULT =
6162
new DefaultCodecRegistry("default") {
6263
@Override

0 commit comments

Comments
 (0)