Skip to content
This repository was archived by the owner on Apr 4, 2025. It is now read-only.

Spring session in a multidatasource environment #170

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open

Spring session in a multidatasource environment #170

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
88eaa08
How to configure additional Datasource for Spring Session #96
visweshwar Jun 2, 2019
09822b5
How to configure additional Datasource for Spring Session #96
visweshwar Jun 2, 2019
c6b215c
Reformatting the code.. #96
visweshwar Jun 2, 2019
d74bad0
Reformatting the code.. #96
visweshwar Jun 2, 2019
201a53b
Fixing Style Errors #96
visweshwar Jun 2, 2019
56c5329
Fixing Style Errors #96
visweshwar Jun 2, 2019
07a3e30
Fixing Style Errors #96
visweshwar Jun 2, 2019
04cc782
Fixing Style Errors #96
visweshwar Jun 2, 2019
f5805e8
Merge pull request #1 from paychex/MultiDatasource
visweshwar Jan 1, 2020
90a76c1
Merging from Spring Master to Fork Master
visweshwar Jan 3, 2020
eceabd1
Merge remote-tracking branch 'origin/master'
visweshwar Jan 3, 2020
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
Prev Previous commit
Next Next commit
Reformatting the code.. #96
  • Loading branch information
@visweshwar
visweshwar committed Jun 2, 2019
commit d74bad09c8dcab4916eebb7f77f2f98c436647d7
4 changes: 2 additions & 2 deletions ...ramework/session/data/mongo/config/annotation/web/http/MongoHttpSessionConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ public void setMaxInactiveIntervalInSeconds(Integer maxInactiveIntervalInSeconds

public void setImportMetadata(AnnotationMetadata importMetadata) {

AnnotationAttributes attributes = AnnotationAttributes.fromMap(
importMetadata.getAnnotationAttributes(EnableMongoHttpSession.class.getName()));
AnnotationAttributes attributes = AnnotationAttributes
.fromMap(importMetadata.getAnnotationAttributes(EnableMongoHttpSession.class.getName()));

if (attributes != null) {
this.maxInactiveIntervalInSeconds = attributes.getNumber("maxInactiveIntervalInSeconds");
Expand Down
31 changes: 16 additions & 15 deletions ...work/session/data/mongo/config/annotation/web/http/MongoHttpSessionConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,21 @@
*/
package org.springframework.session.data.mongo.config.annotation.web.http;

import static org.assertj.core.api.Assertions.*;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.BDDMockito.*;


import org.junit.After;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.context.annotation.*;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.Primary;
import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
import org.springframework.data.mongodb.core.MongoOperations;
import org.springframework.data.mongodb.core.index.IndexOperations;
Expand All @@ -29,12 +38,6 @@
import org.springframework.session.data.mongo.MongoOperationsSessionRepository;
import org.springframework.test.util.ReflectionTestUtils;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.BDDMockito.given;
import static org.mockito.BDDMockito.mock;

/**
* Tests for {@link MongoHttpSessionConfiguration}.
*
Expand All @@ -47,8 +50,7 @@ public class MongoHttpSessionConfigurationTest {

private static final int MAX_INACTIVE_INTERVAL_IN_SECONDS = 600;

@Rule
public final ExpectedException thrown = ExpectedException.none();
@Rule public final ExpectedException thrown = ExpectedException.none();

private AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();

Expand Down Expand Up @@ -106,8 +108,8 @@ public void customMaxInactiveIntervalInSeconds() {
MongoOperationsSessionRepository repository = this.context.getBean(MongoOperationsSessionRepository.class);

assertThat(repository).isNotNull();
assertThat(ReflectionTestUtils.getField(repository, "maxInactiveIntervalInSeconds")).isEqualTo(
MAX_INACTIVE_INTERVAL_IN_SECONDS);
assertThat(ReflectionTestUtils.getField(repository, "maxInactiveIntervalInSeconds"))
.isEqualTo(MAX_INACTIVE_INTERVAL_IN_SECONDS);
}

@Test
Expand All @@ -118,8 +120,8 @@ public void setCustomMaxInactiveIntervalInSeconds() {
MongoOperationsSessionRepository repository = this.context.getBean(MongoOperationsSessionRepository.class);

assertThat(repository).isNotNull();
assertThat(ReflectionTestUtils.getField(repository, "maxInactiveIntervalInSeconds")).isEqualTo(
MAX_INACTIVE_INTERVAL_IN_SECONDS);
assertThat(ReflectionTestUtils.getField(repository, "maxInactiveIntervalInSeconds"))
.isEqualTo(MAX_INACTIVE_INTERVAL_IN_SECONDS);
}

@Test
Expand All @@ -138,8 +140,7 @@ public void setCustomSessionConverterConfiguration() {
@Test
public void resolveCollectionNameByPropertyPlaceholder() {

this.context.setEnvironment(
new MockEnvironment().withProperty("session.mongo.collectionName", COLLECTION_NAME));
this.context.setEnvironment(new MockEnvironment().withProperty("session.mongo.collectionName", COLLECTION_NAME));
registerAndRefresh(CustomMongoJdbcSessionConfiguration.class);

MongoHttpSessionConfiguration configuration = this.context.getBean(MongoHttpSessionConfiguration.class);
Expand Down