diff --git a/spring-session/src/main/java/org/springframework/session/data/mongo/AbstractMongoSessionConverter.java b/spring-session/src/main/java/org/springframework/session/data/mongo/AbstractMongoSessionConverter.java index a0e6b96f..a10415e0 100644 --- a/spring-session/src/main/java/org/springframework/session/data/mongo/AbstractMongoSessionConverter.java +++ b/spring-session/src/main/java/org/springframework/session/data/mongo/AbstractMongoSessionConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2016 the original author or authors. + * Copyright 2014-2017 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. @@ -40,7 +40,9 @@ import org.springframework.session.Session; * * @author Jakub Kubrynski * @since 1.2 + * @deprecated as of 1.4, to be removed in 2.0 */ +@Deprecated public abstract class AbstractMongoSessionConverter implements GenericConverter { private static final Log LOG = LogFactory.getLog(AbstractMongoSessionConverter.class); diff --git a/spring-session/src/main/java/org/springframework/session/data/mongo/AuthenticationParser.java b/spring-session/src/main/java/org/springframework/session/data/mongo/AuthenticationParser.java index a65419bf..95fa00e2 100644 --- a/spring-session/src/main/java/org/springframework/session/data/mongo/AuthenticationParser.java +++ b/spring-session/src/main/java/org/springframework/session/data/mongo/AuthenticationParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2016 the original author or authors. + * Copyright 2014-2017 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. @@ -22,7 +22,9 @@ import org.springframework.expression.spel.standard.SpelExpressionParser; * Utility class to extract principal name from {@code Authentication} object. * * @author Jakub Kubrynski + * @deprecated as of 1.4, to be removed in 2.0 */ +@Deprecated final class AuthenticationParser { private static final String NAME_EXPRESSION = "authentication?.name"; diff --git a/spring-session/src/main/java/org/springframework/session/data/mongo/JacksonMongoSessionConverter.java b/spring-session/src/main/java/org/springframework/session/data/mongo/JacksonMongoSessionConverter.java index 24b770f6..b64fa18b 100644 --- a/spring-session/src/main/java/org/springframework/session/data/mongo/JacksonMongoSessionConverter.java +++ b/spring-session/src/main/java/org/springframework/session/data/mongo/JacksonMongoSessionConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2016 the original author or authors. + * Copyright 2014-2017 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. @@ -39,7 +39,9 @@ import org.springframework.session.FindByIndexNameSessionRepository; * * @author Jakub Kubrynski * @since 1.2 + * @deprecated as of 1.4, to be removed in 2.0 */ +@Deprecated public class JacksonMongoSessionConverter extends AbstractMongoSessionConverter { private static final Log LOG = LogFactory.getLog(JacksonMongoSessionConverter.class); diff --git a/spring-session/src/main/java/org/springframework/session/data/mongo/JdkMongoSessionConverter.java b/spring-session/src/main/java/org/springframework/session/data/mongo/JdkMongoSessionConverter.java index d0d64baa..fb7863a8 100644 --- a/spring-session/src/main/java/org/springframework/session/data/mongo/JdkMongoSessionConverter.java +++ b/spring-session/src/main/java/org/springframework/session/data/mongo/JdkMongoSessionConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2016 the original author or authors. + * Copyright 2014-2017 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. @@ -37,7 +37,9 @@ import org.springframework.util.Assert; * @author Jakub Kubrynski * @author Rob Winch * @since 1.2 + * @deprecated as of 1.4, to be removed in 2.0 */ +@Deprecated public class JdkMongoSessionConverter extends AbstractMongoSessionConverter { private static final String ID = "_id"; diff --git a/spring-session/src/main/java/org/springframework/session/data/mongo/MongoExpiringSession.java b/spring-session/src/main/java/org/springframework/session/data/mongo/MongoExpiringSession.java index 6fcc22b4..0fc06f42 100644 --- a/spring-session/src/main/java/org/springframework/session/data/mongo/MongoExpiringSession.java +++ b/spring-session/src/main/java/org/springframework/session/data/mongo/MongoExpiringSession.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2016 the original author or authors. + * Copyright 2014-2017 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. @@ -30,7 +30,9 @@ import org.springframework.session.ExpiringSession; * * @author Jakub Kubrynski * @since 1.2 + * @deprecated as of 1.4, to be removed in 2.0 */ +@Deprecated public class MongoExpiringSession implements ExpiringSession { /** diff --git a/spring-session/src/main/java/org/springframework/session/data/mongo/MongoOperationsSessionRepository.java b/spring-session/src/main/java/org/springframework/session/data/mongo/MongoOperationsSessionRepository.java index 7f6f11e8..60d3e84f 100644 --- a/spring-session/src/main/java/org/springframework/session/data/mongo/MongoOperationsSessionRepository.java +++ b/spring-session/src/main/java/org/springframework/session/data/mongo/MongoOperationsSessionRepository.java @@ -40,7 +40,9 @@ import org.springframework.session.FindByIndexNameSessionRepository; * * @author Jakub Kubrynski * @since 1.2 + * @deprecated as of 1.4, to be removed in 2.0 */ +@Deprecated public class MongoOperationsSessionRepository implements FindByIndexNameSessionRepository { diff --git a/spring-session/src/main/java/org/springframework/session/data/mongo/SessionConverterProvider.java b/spring-session/src/main/java/org/springframework/session/data/mongo/SessionConverterProvider.java index 7addcf62..50007067 100644 --- a/spring-session/src/main/java/org/springframework/session/data/mongo/SessionConverterProvider.java +++ b/spring-session/src/main/java/org/springframework/session/data/mongo/SessionConverterProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2016 the original author or authors. + * Copyright 2014-2017 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. @@ -21,7 +21,9 @@ import org.springframework.util.ClassUtils; * Provider choosing proper AbstractMongoSessionConverter. * * @author Jakub Kubrynski + * @deprecated as of 1.4, to be removed in 2.0 */ +@Deprecated final class SessionConverterProvider { private static final String JACKSON_CLASS_NAME = "com.fasterxml.jackson.databind.ObjectMapper"; diff --git a/spring-session/src/main/java/org/springframework/session/data/mongo/config/annotation/web/http/EnableMongoHttpSession.java b/spring-session/src/main/java/org/springframework/session/data/mongo/config/annotation/web/http/EnableMongoHttpSession.java index de1b761d..0dc73bc3 100644 --- a/spring-session/src/main/java/org/springframework/session/data/mongo/config/annotation/web/http/EnableMongoHttpSession.java +++ b/spring-session/src/main/java/org/springframework/session/data/mongo/config/annotation/web/http/EnableMongoHttpSession.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2016 the original author or authors. + * Copyright 2014-2017 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. @@ -44,12 +44,14 @@ import org.springframework.session.data.mongo.MongoOperationsSessionRepository; * * @author Jakub Kubrynski * @since 1.2 + * @deprecated as of 1.4, to be removed in 2.0 */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) @Documented @Import(MongoHttpSessionConfiguration.class) @Configuration +@Deprecated public @interface EnableMongoHttpSession { /** diff --git a/spring-session/src/main/java/org/springframework/session/data/mongo/config/annotation/web/http/MongoHttpSessionConfiguration.java b/spring-session/src/main/java/org/springframework/session/data/mongo/config/annotation/web/http/MongoHttpSessionConfiguration.java index 9922e98a..1e786a2f 100644 --- a/spring-session/src/main/java/org/springframework/session/data/mongo/config/annotation/web/http/MongoHttpSessionConfiguration.java +++ b/spring-session/src/main/java/org/springframework/session/data/mongo/config/annotation/web/http/MongoHttpSessionConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2016 the original author or authors. + * Copyright 2014-2017 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. @@ -36,8 +36,10 @@ import org.springframework.util.StringValueResolver; * @author Jakub Kubrynski * @author EddĂș MelĂ©ndez * @since 1.2 + * @deprecated as of 1.4, to be removed in 2.0 */ @Configuration +@Deprecated public class MongoHttpSessionConfiguration extends SpringHttpSessionConfiguration implements EmbeddedValueResolverAware, ImportAware {