Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2014-2022 the original author or authors.
* Copyright 2014-2023 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.
Expand All @@ -21,9 +21,10 @@
import java.time.Instant;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.ServiceLoader;
import java.util.Set;
import java.util.UUID;

/**
* <p>
Expand All @@ -44,6 +45,7 @@
*
* @author Rob Winch
* @author Vedran Pavic
* @author Yanming Zhou
* @since 1.0
*/
public final class MapSession implements Session, Serializable {
Expand Down Expand Up @@ -229,7 +231,14 @@ public int hashCode() {
}

private static String generateId() {
return UUID.randomUUID().toString();
return sessionIdGenerator.generateId();
}

private static final SessionIdGenerator sessionIdGenerator;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

static is not good idea

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then what's your suggestion?

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At present, this PR can solve the problem easily.
I think static is structural problem (not this PR), I prefer PR #1547, using spring DI is better than SPI.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That huge changeset is risky, this one is simple and reliable.


static {
Iterator<SessionIdGenerator> generators = ServiceLoader.load(SessionIdGenerator.class).iterator();
sessionIdGenerator = generators.hasNext() ? generators.next() : SessionIdGenerator.DEFAULT;
}

private static final long serialVersionUID = 7160779239673823561L;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
/*
* Copyright 2014-2023 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.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.springframework.session;

import java.util.UUID;

/**
* <p>
* Id generator for creating new session.
* </p>
*
* @author Yanming Zhou
*/
@FunctionalInterface
public interface SessionIdGenerator {

/**
* Using random UUID as default id generator.
*/
SessionIdGenerator DEFAULT = () -> UUID.randomUUID().toString();

/**
* Generate and return a new session identifier.
* @return the newly generated session id
*/
String generateId();

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
/*
* Copyright 2014-2023 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.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.springframework.session;

import java.util.concurrent.atomic.AtomicLong;

import org.junit.jupiter.api.Test;

import static org.assertj.core.api.Assertions.assertThat;

/**
* @author Yanming Zhou
*/
class SessionIdGeneratorTests {

static final String prefix = "sessionid-";

@Test
void sessionIdShouldStartsWithCustomizedPrefix() {
MapSession session = new MapSession();
assertThat(session.getId()).startsWith(prefix);
session.changeSessionId();
assertThat(session.getId()).startsWith(prefix);
}

public static class MySessionIdGenerator implements SessionIdGenerator {

private final AtomicLong counter = new AtomicLong();

@Override
public String generateId() {
return prefix + this.counter.incrementAndGet();
}

}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
org.springframework.session.SessionIdGeneratorTests$MySessionIdGenerator