Spring/spring-session
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix deprecation warnings

Browse Source
This commit is contained in:
Vedran Pavic
2022-08-19 23:55:50 +02:00
committed by Rob Winch
parent 8c49d5993f
commit 8e8de48614
66 changed files with 278 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/ClientServerHazelcastIndexedSessionRepositoryITests.java
View File

@@ -70,8 +70,7 @@ class ClientServerHazelcastIndexedSessionRepositoryITests extends AbstractHazelc
@Bean
HazelcastInstance hazelcastInstance() {
ClientConfig clientConfig = new ClientConfig();
clientConfig.getNetworkConfig()
.addAddress(container.getContainerIpAddress() + ":" + container.getFirstMappedPort());
clientConfig.getNetworkConfig().addAddress(container.getHost() + ":" + container.getFirstMappedPort());
clientConfig.getUserCodeDeploymentConfig().setEnabled(true).addClass(Session.class)
.addClass(MapSession.class).addClass(SessionUpdateEntryProcessor.class);
return HazelcastClient.newHazelcastClient(clientConfig);

14
spring-session-hazelcast/src/main/java/org/springframework/session/hazelcast/HazelcastSessionSerializer.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014-2020 the original author or authors.
* Copyright 2014-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -87,15 +87,15 @@ public class HazelcastSessionSerializer implements StreamSerializer<MapSession>
@Override
public void write(ObjectDataOutput out, MapSession session) throws IOException {
out.writeUTF(session.getOriginalId());
out.writeUTF(session.getId());
out.writeString(session.getOriginalId());
out.writeString(session.getId());
writeInstant(out, session.getCreationTime());
writeInstant(out, session.getLastAccessedTime());
writeDuration(out, session.getMaxInactiveInterval());
for (String attrName : session.getAttributeNames()) {
Object attrValue = session.getAttribute(attrName);
if (attrValue != null) {
out.writeUTF(attrName);
out.writeString(attrName);
out.writeObject(attrValue);
}
}
@@ -113,9 +113,9 @@ public class HazelcastSessionSerializer implements StreamSerializer<MapSession>
@Override
public MapSession read(ObjectDataInput in) throws IOException {
String originalId = in.readUTF();
String originalId = in.readString();
MapSession cached = new MapSession(originalId);
cached.setId(in.readUTF());
cached.setId(in.readString());
cached.setCreationTime(readInstant(in));
cached.setLastAccessedTime(readInstant(in));
cached.setMaxInactiveInterval(readDuration(in));
@@ -125,7 +125,7 @@ public class HazelcastSessionSerializer implements StreamSerializer<MapSession>
// number of non-null attributes without an extra
// iteration. Hence the attributes are read until
// EOF here.
String attrName = in.readUTF();
String attrName = in.readString();
Object attrValue = in.readObject();
cached.setAttribute(attrName, attrValue);
}