Add support for Java 10

This commit is contained in:
Greg Turnquist
2018-05-09 16:39:43 -05:00
parent 3eff1ac525
commit 4e42a83ca8
5 changed files with 65 additions and 30 deletions

View File

@@ -25,11 +25,10 @@ import java.util.List;
import java.util.Map;
import java.util.Optional;
import javax.annotation.PostConstruct;
import org.bson.Document;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.context.ApplicationEvent;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.ApplicationEventPublisherAware;
@@ -56,7 +55,7 @@ import com.mongodb.DBObject;
* @since 1.2
*/
public class MongoOperationsSessionRepository
implements FindByIndexNameSessionRepository<MongoSession>, ApplicationEventPublisherAware {
implements FindByIndexNameSessionRepository<MongoSession>, ApplicationEventPublisherAware, InitializingBean {
/**
* The default time period in seconds in which a session will expire.
@@ -162,8 +161,8 @@ public class MongoOperationsSessionRepository
});
}
@PostConstruct
public void ensureIndexesAreCreated() {
@Override
public void afterPropertiesSet() {
IndexOperations indexOperations = this.mongoOperations.indexOps(this.collectionName);
this.mongoSessionConverter.ensureIndexes(indexOperations);

View File

@@ -19,12 +19,11 @@ import static org.springframework.session.data.mongo.MongoSessionUtils.*;
import java.time.Duration;
import javax.annotation.PostConstruct;
import org.bson.Document;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import reactor.core.publisher.Mono;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.context.ApplicationEvent;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.ApplicationEventPublisherAware;
@@ -39,7 +38,7 @@ import org.springframework.session.events.SessionDeletedEvent;
* @author Greg Turnquist
*/
public class ReactiveMongoOperationsSessionRepository
implements ReactiveSessionRepository<MongoSession>, ApplicationEventPublisherAware {
implements ReactiveSessionRepository<MongoSession>, ApplicationEventPublisherAware, InitializingBean {
/**
* The default time period in seconds in which a session will expire.
@@ -147,8 +146,8 @@ public class ReactiveMongoOperationsSessionRepository
* Do not use {@link org.springframework.data.mongodb.core.index.ReactiveIndexOperations} to ensure indexes exist.
* Instead, get a blocking {@link IndexOperations} and use that instead, if possible.
*/
@PostConstruct
public void ensureIndexesAreCreated() {
@Override
public void afterPropertiesSet() {
if (this.blockingMongoOperations != null) {
IndexOperations indexOperations = this.blockingMongoOperations.indexOps(this.collectionName);

View File

@@ -206,7 +206,7 @@ public class ReactiveMongoOperationsSessionRepositoryTest {
this.repository.setBlockingMongoOperations(this.blockingMongoOperations);
// when
this.repository.ensureIndexesAreCreated();
this.repository.afterPropertiesSet();
// then
verify(this.blockingMongoOperations, times(1)).indexOps((String) any());