ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-18 20:47:57 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

ENT-11106: Upgrade dependencies Part 1, (jackson, caffeine, guava, je… (#7708)

Browse Source 
* ENT-11106: Upgrade dependencies Part 1, (jackson, caffeine, guava, jetty.

* ENT-11106: removed unused import.

* ENT-11106: Fixed the deprecation and null check.
This commit is contained in:
Adel El-Beik 2024-04-03 12:59:34 +01:00 committed by GitHub
parent 6c4b8fdf23
commit 9ab1b36128
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/rpc/src/main/kotlin/net/corda/client/rpc/internal/RPCClientProxyHandler.kt
View File

@ -345,7 +345,7 @@ internal class RPCClientProxyHandler(
impersonatedActor,
rpcClientTelemetry.telemetryService.getCurrentTelemetryData()
)
val replyFuture = SettableFuture.create<Any>()
val replyFuture = SettableFuture.create<Any?>()
require(rpcReplyMap.put(replyId, replyFuture) == null) {
"Generated several RPC requests with same ID $replyId"
}

10
constants.properties
View File

@ -16,7 +16,7 @@ internalPublishVersion=1.+
platformVersion=140
openTelemetryVersion=1.20.1
openTelemetrySemConvVersion=1.20.1-alpha
guavaVersion=28.0-jre
guavaVersion=33.1.0-jre
quasarVersion=0.9.0_r3
dockerJavaVersion=3.2.5
proguardVersion=7.3.1
@ -28,7 +28,7 @@ typesafeConfigVersion=1.3.4
jsr305Version=3.0.2
artifactoryPluginVersion=4.16.1
snakeYamlVersion=1.33
caffeineVersion=2.9.3
caffeineVersion=3.1.8
metricsVersion=4.1.0
metricsNewRelicVersion=1.1.1
openSourceBranch=https://github.com/corda/corda/blob/release/os/4.4
@ -47,9 +47,9 @@ capsuleVersion=1.0.4_r3
asmVersion=9.5
artemisVersion=2.32.0
# TODO Upgrade Jackson only when corda is using kotlin 1.3.10
jacksonVersion=2.13.5
jacksonKotlinVersion=2.9.7
jettyVersion=9.4.53.v20231009
jacksonVersion=2.17.0
jacksonKotlinVersion=2.17.0
jettyVersion=9.4.54.v20240208
jerseyVersion=2.25
servletVersion=4.0.1
assertjVersion=3.12.2

6
serialization/src/test/java/net/corda/serialization/internal/amqp/JavaGenericsTest.java
View File

@ -6,7 +6,6 @@ import net.corda.serialization.internal.amqp.custom.BigIntegerSerializer;
import net.corda.serialization.internal.amqp.testutils.AMQPTestUtilsKt;
import net.corda.serialization.internal.amqp.testutils.TestSerializationContext;
import org.hamcrest.CoreMatchers;
import org.junit.Assert;
import org.junit.Test;
import java.io.NotSerializableException;
@ -14,6 +13,7 @@ import java.math.BigInteger;
import java.util.*;
import static net.corda.serialization.internal.amqp.testutils.AMQPTestUtilsKt.testDefaultFactory;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
@SuppressWarnings("unchecked")
@ -160,7 +160,7 @@ public class JavaGenericsTest {
SerializedBytes<?> bytes = ser.serialize(genericList, TestSerializationContext.testSerializationContext);
DeserializationInput des = new DeserializationInput(factory);
HolderOfGeneric<GenericClassWithList<ConcreteClass>> genericList2 = des.deserialize(bytes, HolderOfGeneric.class, TestSerializationContext.testSerializationContext);
Assert.assertThat(genericList, CoreMatchers.is(CoreMatchers.equalTo(genericList2)));
assertThat(genericList, CoreMatchers.is(CoreMatchers.equalTo(genericList2)));
}
@ -174,7 +174,7 @@ public class JavaGenericsTest {
SerializedBytes<?> bytes = ser.serialize(genericMap, TestSerializationContext.testSerializationContext);
DeserializationInput des = new DeserializationInput(factory);
GenericClassWithMap<ConcreteClass, BigInteger> genericMap2 = des.deserialize(bytes, GenericClassWithMap.class, TestSerializationContext.testSerializationContext);
Assert.assertThat(genericMap2, CoreMatchers.is(CoreMatchers.equalTo(genericMap2)));
assertThat(genericMap2, CoreMatchers.is(CoreMatchers.equalTo(genericMap2)));
}
@Test