From fd55882a6e2d6ce288945baf345b725c7be4bf5a Mon Sep 17 00:00:00 2001 From: Vedran Pavic Date: Sat, 6 May 2017 21:07:55 +0200 Subject: [PATCH] Deprecate GemFire Fixes gh-773 --- .../gemfire/AbstractGemFireOperationsSessionRepository.java | 4 +++- .../data/gemfire/GemFireOperationsSessionRepository.java | 4 +++- .../config/annotation/web/http/EnableGemFireHttpSession.java | 4 +++- .../annotation/web/http/GemFireHttpSessionConfiguration.java | 4 +++- .../http/support/GemFireCacheTypeAwareRegionFactoryBean.java | 4 +++- .../web/http/support/SessionAttributesIndexFactoryBean.java | 4 +++- .../session/data/gemfire/support/GemFireUtils.java | 4 +++- 7 files changed, 21 insertions(+), 7 deletions(-) diff --git a/spring-session/src/main/java/org/springframework/session/data/gemfire/AbstractGemFireOperationsSessionRepository.java b/spring-session/src/main/java/org/springframework/session/data/gemfire/AbstractGemFireOperationsSessionRepository.java index dfaf65d9..3db05411 100644 --- a/spring-session/src/main/java/org/springframework/session/data/gemfire/AbstractGemFireOperationsSessionRepository.java +++ b/spring-session/src/main/java/org/springframework/session/data/gemfire/AbstractGemFireOperationsSessionRepository.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. @@ -81,7 +81,9 @@ import org.springframework.util.StringUtils; * @see org.springframework.session.FindByIndexNameSessionRepository * @see org.springframework.session.data.gemfire.config.annotation.web.http.EnableGemFireHttpSession * @see com.gemstone.gemfire.cache.util.CacheListenerAdapter + * @deprecated as of 1.4, to be removed in 2.0 */ +@Deprecated public abstract class AbstractGemFireOperationsSessionRepository extends CacheListenerAdapter implements InitializingBean, FindByIndexNameSessionRepository, ApplicationEventPublisherAware { diff --git a/spring-session/src/main/java/org/springframework/session/data/gemfire/GemFireOperationsSessionRepository.java b/spring-session/src/main/java/org/springframework/session/data/gemfire/GemFireOperationsSessionRepository.java index d958d3ea..793d8822 100644 --- a/spring-session/src/main/java/org/springframework/session/data/gemfire/GemFireOperationsSessionRepository.java +++ b/spring-session/src/main/java/org/springframework/session/data/gemfire/GemFireOperationsSessionRepository.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. @@ -31,7 +31,9 @@ import org.springframework.session.ExpiringSession; * @author John Blum * @since 1.1.0 * @see AbstractGemFireOperationsSessionRepository + * @deprecated as of 1.4, to be removed in 2.0 */ +@Deprecated public class GemFireOperationsSessionRepository extends AbstractGemFireOperationsSessionRepository { // GemFire OQL query used to lookup Sessions by arbitrary attributes. diff --git a/spring-session/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/EnableGemFireHttpSession.java b/spring-session/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/EnableGemFireHttpSession.java index 14cf7bdc..694e5161 100644 --- a/spring-session/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/EnableGemFireHttpSession.java +++ b/spring-session/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/EnableGemFireHttpSession.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. @@ -103,12 +103,14 @@ import org.springframework.context.annotation.Import; * @see org.springframework.session.config.annotation.web.http.EnableSpringHttpSession * @see org.springframework.session.data.gemfire.config.annotation.web.http.GemFireHttpSessionConfiguration * @since 1.1.0 + * @deprecated as of 1.4, to be removed in 2.0 */ @Documented @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) @Configuration @Import(GemFireHttpSessionConfiguration.class) +@Deprecated public @interface EnableGemFireHttpSession { /** diff --git a/spring-session/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/GemFireHttpSessionConfiguration.java b/spring-session/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/GemFireHttpSessionConfiguration.java index f194d05f..8c5fb13d 100644 --- a/spring-session/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/GemFireHttpSessionConfiguration.java +++ b/spring-session/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/GemFireHttpSessionConfiguration.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. @@ -66,8 +66,10 @@ import org.springframework.util.StringUtils; * @see com.gemstone.gemfire.cache.GemFireCache * @see com.gemstone.gemfire.cache.Region * @since 1.1.0 + * @deprecated as of 1.4, to be removed in 2.0 */ @Configuration +@Deprecated public class GemFireHttpSessionConfiguration extends SpringHttpSessionConfiguration implements BeanClassLoaderAware, ImportAware { diff --git a/spring-session/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/support/GemFireCacheTypeAwareRegionFactoryBean.java b/spring-session/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/support/GemFireCacheTypeAwareRegionFactoryBean.java index 9ae5ab17..8a04900a 100644 --- a/spring-session/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/support/GemFireCacheTypeAwareRegionFactoryBean.java +++ b/spring-session/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/support/GemFireCacheTypeAwareRegionFactoryBean.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. @@ -49,7 +49,9 @@ import org.springframework.util.StringUtils; * @see org.springframework.beans.factory.BeanFactoryAware * @see org.springframework.beans.factory.FactoryBean * @see org.springframework.beans.factory.InitializingBean + * @deprecated as of 1.4, to be removed in 2.0 */ +@Deprecated public class GemFireCacheTypeAwareRegionFactoryBean implements BeanFactoryAware, FactoryBean>, InitializingBean { diff --git a/spring-session/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/support/SessionAttributesIndexFactoryBean.java b/spring-session/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/support/SessionAttributesIndexFactoryBean.java index ee18150d..dab61964 100644 --- a/spring-session/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/support/SessionAttributesIndexFactoryBean.java +++ b/spring-session/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/support/SessionAttributesIndexFactoryBean.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. @@ -42,7 +42,9 @@ import org.springframework.util.ObjectUtils; * @see org.springframework.beans.factory.FactoryBean * @see org.springframework.beans.factory.InitializingBean * @see com.gemstone.gemfire.cache.query.Index + * @deprecated as of 1.4, to be removed in 2.0 */ +@Deprecated public class SessionAttributesIndexFactoryBean implements FactoryBean, InitializingBean, BeanFactoryAware, BeanNameAware { diff --git a/spring-session/src/main/java/org/springframework/session/data/gemfire/support/GemFireUtils.java b/spring-session/src/main/java/org/springframework/session/data/gemfire/support/GemFireUtils.java index 8b5fcf57..fcf943df 100644 --- a/spring-session/src/main/java/org/springframework/session/data/gemfire/support/GemFireUtils.java +++ b/spring-session/src/main/java/org/springframework/session/data/gemfire/support/GemFireUtils.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. @@ -34,7 +34,9 @@ import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; * * @author John Blum * @since 1.1.0 + * @deprecated as of 1.4, to be removed in 2.0 */ +@Deprecated public abstract class GemFireUtils { /**