External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-20 02:30:08 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

dev: updated some libs, removed outdated and unused s3/aws code and annotations (#13802)

Browse source
This commit is contained in:
ReSech 2025-06-29 22:36:10 +10:00 • committed by GitHub
parent 450f7bd907
commit 6568c1f18a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 11 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage.Server/pom.xml
View file

@ -218,7 +218,7 @@
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-core</artifactId>
<version>1.8.0</version>
<version>1.13.0</version>
</dependency>
<dependency>
<groupId>javax.mail</groupId>

7
Mage.Server/src/main/java/mage/server/SessionManagerImpl.java
View file

@ -8,7 +8,6 @@ import mage.util.ThreadUtils;
import org.apache.log4j.Logger;
import org.jboss.remoting.callback.InvokerCallbackHandler;
import javax.annotation.Nonnull;
import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
@ -29,7 +28,7 @@ public class SessionManagerImpl implements SessionManager {
}
@Override
public Optional<Session> getSession(@Nonnull String sessionId) {
public Optional<Session> getSession(String sessionId) {
return Optional.ofNullable(sessions.getOrDefault(sessionId, null));
}
@ -180,12 +179,12 @@ public class SessionManagerImpl implements SessionManager {
}
@Override
public boolean isValidSession(@Nonnull String sessionId) {
public boolean isValidSession(String sessionId) {
return sessions.containsKey(sessionId);
}
@Override
public Optional<User> getUser(@Nonnull String sessionId) {
public Optional<User> getUser(String sessionId) {
Session session = sessions.get(sessionId);
if (session != null) {
return managerFactory.userManager().getUser(sessions.get(sessionId).getUserId());

7
Mage.Server/src/main/java/mage/server/managers/SessionManager.java
View file

@ -7,12 +7,11 @@ import mage.server.Session;
import mage.server.User;
import org.jboss.remoting.callback.InvokerCallbackHandler;
import javax.annotation.Nonnull;
import java.util.Optional;
public interface SessionManager {
Optional<Session> getSession(@Nonnull String sessionId);
Optional<Session> getSession(String sessionId);
void createSession(String sessionId, InvokerCallbackHandler callbackHandler);
@ -37,9 +36,9 @@ public interface SessionManager {
boolean checkAdminAccess(String sessionId);
boolean isValidSession(@Nonnull String sessionId);
boolean isValidSession(String sessionId);
Optional<User> getUser(@Nonnull String sessionId);
Optional<User> getUser(String sessionId);
boolean extendUserSession(String sessionId, String pingInfo);