Skip to content

Commit 564b3b1

Browse files
jxblumjxblum
committed
Replace Java EE 8 javax package imports with Jakarta EE 9 jakarta package.
Resolves spring-projectsgh-539.
1 parent ec11946 commit 564b3b1

File tree

11 files changed

+79
-87
lines changed

11 files changed

+79
-87
lines changed

Diff for: ‎spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/DefaultFunctionExecutionMethodMetadata.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,26 @@
1414

1515
import java.lang.reflect.Method;
1616

17-
1817
/**
1918
* @author David Turanski
2019
*
2120
*/
2221
class DefaultFunctionExecutionMethodMetadata extends FunctionExecutionMethodMetadata<MethodMetadata> {
2322

2423
/**
25-
* @param serviceInterface
24+
* Constructs a new instance of {@link DefaultFunctionExecutionMethodMetadata} initialized with
25+
* the {@link org.apache.geode.cache.execute.Function} {@link org.apache.geode.cache.execute.Execution}
26+
* {@link Class interface}.
27+
*
28+
* @param serviceInterface {@link org.apache.geode.cache.execute.Function}
29+
* {@link org.apache.geode.cache.execute.Execution} {@link Class interface}.
2630
*/
2731
public DefaultFunctionExecutionMethodMetadata(Class<?> serviceInterface) {
2832
super(serviceInterface);
2933
}
3034

31-
/* (non-Javadoc)
32-
* @see org.springframework.data.gemfire.function.config.FunctionExecutionMethodMetadata#newMetadataInstance(java.lang.reflect.Method)
33-
*/
3435
@Override
3536
protected MethodMetadata newMetadataInstance(Method method) {
3637
return new MethodMetadata(method);
3738
}
38-
3939
}

Diff for: ‎spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryBean.java

+12-15
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
* limitations under the License.
1515
*
1616
*/
17-
1817
package org.springframework.data.gemfire.repository.cdi;
1918

2019
import java.lang.annotation.Annotation;
@@ -24,9 +23,9 @@
2423
import java.util.Optional;
2524
import java.util.Set;
2625

27-
import javax.enterprise.context.spi.CreationalContext;
28-
import javax.enterprise.inject.spi.Bean;
29-
import javax.enterprise.inject.spi.BeanManager;
26+
import jakarta.enterprise.context.spi.CreationalContext;
27+
import jakarta.enterprise.inject.spi.Bean;
28+
import jakarta.enterprise.inject.spi.BeanManager;
3029

3130
import org.apache.geode.cache.Region;
3231

@@ -51,6 +50,7 @@
5150
* @see org.apache.geode.cache.Region
5251
* @since 1.8.0
5352
*/
53+
@SuppressWarnings("rawtypes")
5454
class GemfireRepositoryBean<T> extends CdiRepositoryBean<T> {
5555

5656
static final GemfireMappingContext DEFAULT_GEMFIRE_MAPPING_CONTEXT = new GemfireMappingContext();
@@ -61,8 +61,6 @@ class GemfireRepositoryBean<T> extends CdiRepositoryBean<T> {
6161

6262
private final Set<Bean<Region>> regionBeans;
6363

64-
/* (non-Javadoc) */
65-
@SuppressWarnings("unchecked")
6664
GemfireRepositoryBean(BeanManager beanManager, Class<T> repositoryType, Set<Annotation> qualifiers,
6765
CustomRepositoryImplementationDetector detector, Bean<GemfireMappingContext> gemfireMappingContextBean,
6866
Set<Bean<Region>> regionBeans) {
@@ -77,17 +75,17 @@ class GemfireRepositoryBean<T> extends CdiRepositoryBean<T> {
7775
/**
7876
* Returns an instance of the given {@link Bean} from the container.
7977
*
80-
* @param <S> the actual class type of the {@link Bean}.
78+
* @param <S> the actual {@link Type class type} of the {@link Bean}.
8179
* @param bean the {@link Bean} defining the instance to create.
8280
* @param type the expected component type of the instance created from the {@link Bean}.
8381
* @return an instance of the given {@link Bean}.
84-
* @see javax.enterprise.inject.spi.BeanManager#getReference(Bean, Type, CreationalContext)
82+
* @see javax.enterprise.inject.spi.BeanManager#getReference(javax.enterprise.inject.spi.Bean, Type, javax.enterprise.context.spi.CreationalContext)
8583
* @see javax.enterprise.inject.spi.Bean
8684
* @see java.lang.reflect.Type
8785
*/
8886
@SuppressWarnings("unchecked")
8987
protected <S> S getDependencyInstance(Bean<S> bean, Type type) {
90-
return (S) beanManager.getReference(bean, type, beanManager.createCreationalContext(bean));
88+
return (S) this.beanManager.getReference(bean, type, this.beanManager.createCreationalContext(bean));
9189
}
9290

9391
/**
@@ -101,12 +99,13 @@ protected <S> S getDependencyInstance(Bean<S> bean, Type type) {
10199
* @see javax.enterprise.inject.spi.Bean#getTypes()
102100
* @see java.lang.Class
103101
*/
104-
@SuppressWarnings("unchecked")
105102
protected <S> Type resolveType(Bean<S> bean, Class<S> targetType) {
103+
106104
for (Type type : bean.getTypes()) {
105+
107106
Type assignableType = (type instanceof ParameterizedType ? ((ParameterizedType) type).getRawType() : type);
108107

109-
if (assignableType instanceof Class && targetType.isAssignableFrom((Class) assignableType)) {
108+
if (assignableType instanceof Class && targetType.isAssignableFrom((Class<?>) assignableType)) {
110109
return type;
111110
}
112111
}
@@ -116,9 +115,9 @@ protected <S> Type resolveType(Bean<S> bean, Class<S> targetType) {
116115
targetType, bean));
117116
}
118117

119-
/* (non-Javadoc) */
120118
Iterable<Region<?, ?>> resolveGemfireRegions() {
121-
Set<Region<?, ?>> regions = new HashSet<Region<?, ?>>(regionBeans.size());
119+
120+
Set<Region<?, ?>> regions = new HashSet<>(regionBeans.size());
122121

123122
for (Bean<Region> regionBean : regionBeans) {
124123
regions.add(getDependencyInstance(regionBean, resolveType(regionBean, Region.class)));
@@ -127,14 +126,12 @@ protected <S> Type resolveType(Bean<S> bean, Class<S> targetType) {
127126
return regions;
128127
}
129128

130-
/* (non-Javadoc) */
131129
GemfireMappingContext resolveGemfireMappingContext() {
132130
return (gemfireMappingContextBean != null
133131
? getDependencyInstance(gemfireMappingContextBean, GemfireMappingContext.class)
134132
: DEFAULT_GEMFIRE_MAPPING_CONTEXT);
135133
}
136134

137-
/* (non-Javadoc) */
138135
GemfireRepositoryFactory newGemfireRepositoryFactory() {
139136
return new GemfireRepositoryFactory(resolveGemfireRegions(), resolveGemfireMappingContext());
140137
}

Diff for: ‎spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryExtension.java

+21-24
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
* limitations under the License.
1515
*
1616
*/
17-
1817
package org.springframework.data.gemfire.repository.cdi;
1918

2019
import java.lang.annotation.Annotation;
@@ -25,40 +24,39 @@
2524
import java.util.Map;
2625
import java.util.Set;
2726

28-
import javax.enterprise.event.Observes;
29-
import javax.enterprise.inject.spi.AfterBeanDiscovery;
30-
import javax.enterprise.inject.spi.Bean;
31-
import javax.enterprise.inject.spi.BeanManager;
32-
import javax.enterprise.inject.spi.ProcessBean;
27+
import jakarta.enterprise.event.Observes;
28+
import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
29+
import jakarta.enterprise.inject.spi.Bean;
30+
import jakarta.enterprise.inject.spi.BeanManager;
31+
import jakarta.enterprise.inject.spi.ProcessBean;
3332

3433
import org.apache.geode.cache.Region;
3534

36-
import org.slf4j.Logger;
37-
import org.slf4j.LoggerFactory;
38-
3935
import org.springframework.data.gemfire.mapping.GemfireMappingContext;
4036
import org.springframework.data.repository.cdi.CdiRepositoryBean;
4137
import org.springframework.data.repository.cdi.CdiRepositoryExtensionSupport;
4238

39+
import org.slf4j.Logger;
40+
import org.slf4j.LoggerFactory;
41+
4342
/**
4443
* The GemfireRepositoryExtension class...
4544
*
4645
* @author John Blum
4746
* @see org.springframework.data.repository.cdi.CdiRepositoryExtensionSupport
4847
* @since 1.8.0
4948
*/
50-
@SuppressWarnings("unused")
49+
@SuppressWarnings({ "rawtypes", "unused" })
5150
public class GemfireRepositoryExtension extends CdiRepositoryExtensionSupport {
5251

53-
protected final Logger logger = LoggerFactory.getLogger(getClass());
52+
private final Logger logger = LoggerFactory.getLogger(getClass());
5453

5554
final Map<Set<Annotation>, Bean<GemfireMappingContext>> mappingContexts = new HashMap<>();
5655

5756
final Set<Bean<Region>> regionBeans = new HashSet<>();
5857

59-
/* (non-Javadoc) */
6058
public GemfireRepositoryExtension() {
61-
logger.info("Activating CDI extension for Spring Data GemFire Repositories");
59+
logger.info("Activating CDI extension for Spring Data Geode Repositories");
6260
}
6361

6462
/**
@@ -67,8 +65,8 @@ public GemfireRepositoryExtension() {
6765
*
6866
* @param <X> class type of the bean instance.
6967
* @param processBean annotated type as defined by CDI.
70-
* @see javax.enterprise.inject.spi.ProcessBean
71-
* @see javax.enterprise.event.Observes
68+
* @see jakarta.enterprise.inject.spi.ProcessBean
69+
* @see jakarta.enterprise.event.Observes
7270
*/
7371
@SuppressWarnings("unchecked")
7472
<X> void processBean(@Observes ProcessBean<X> processBean) {
@@ -107,9 +105,9 @@ else if (GemfireMappingContext.class.isAssignableFrom(classType)) {
107105
* Repository beans are associated to the appropriate GemfireMappingContexts based on their qualifiers.
108106
*
109107
* @param beanManager the BeanManager instance.
110-
* @see javax.enterprise.inject.spi.AfterBeanDiscovery
111-
* @see javax.enterprise.inject.spi.BeanManager
112-
* @see javax.enterprise.event.Observes
108+
* @see jakarta.enterprise.inject.spi.AfterBeanDiscovery
109+
* @see jakarta.enterprise.inject.spi.BeanManager
110+
* @see jakarta.enterprise.event.Observes
113111
*/
114112
void afterBeanDiscovery(@Observes AfterBeanDiscovery afterBeanDiscovery, BeanManager beanManager) {
115113

@@ -130,15 +128,14 @@ void afterBeanDiscovery(@Observes AfterBeanDiscovery afterBeanDiscovery, BeanMan
130128
}
131129
}
132130

133-
/* (non-Javadoc) */
134131
<T> CdiRepositoryBean<T> createRepositoryBean(BeanManager beanManager, Class<T> repositoryType,
135132
Set<Annotation> qualifiers) {
136133

137-
// Determine the GemfireMappingContext bean that matches the qualifiers of the Repository.
138-
Bean<GemfireMappingContext> gemfireMappingContextBean = mappingContexts.get(qualifiers);
134+
// Determine the GemfireMappingContext bean matching the qualifiers of the Repository.
135+
Bean<GemfireMappingContext> gemfireMappingContextBean = this.mappingContexts.get(qualifiers);
139136

140-
// Construct and return a GemFire Repository bean.
141-
return new GemfireRepositoryBean<T>(beanManager, repositoryType, qualifiers, getCustomImplementationDetector(),
142-
gemfireMappingContextBean, regionBeans);
137+
// Construct and return a GemfireRepositoryBean.
138+
return new GemfireRepositoryBean<>(beanManager, repositoryType, qualifiers, getCustomImplementationDetector(),
139+
gemfireMappingContextBean, this.regionBeans);
143140
}
144141
}

Diff for: ‎spring-data-geode/src/main/java/org/springframework/data/gemfire/serialization/WiringInstantiator.java

+7-10
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
1716
package org.springframework.data.gemfire.serialization;
1817

1918
import org.apache.geode.DataSerializable;
@@ -28,25 +27,23 @@
2827
import org.springframework.beans.factory.wiring.BeanConfigurerSupport;
2928

3029
/**
31-
* Instantiator that performs instance wiring using the Spring IoC container, allowing common properties
32-
* to be injected before the object is hydrated/deserialized. The newly created instances can be configured
33-
* either by relying on an existing bean definition (which acts as a template) or by providing an embedded
34-
* configuration through annotations.
30+
* Apache Geode {@link Instantiator} that performs instance wiring using the Spring IoC container, allowing common
31+
* properties to be injected before the object is hydrated/deserialized. The newly created instances can be configured
32+
* either by relying on an existing bean definition (which acts as a template) or by providing an embedded configuration
33+
* through annotations.
3534
*
36-
* Can reuse existing instantiators to optimize instance creation. If one is not provided, it will fallback
37-
* to reflection invocation.
35+
* Can reuse existing {@link Instantiator Instantiators} to optimize instance creation. If one is not provided,
36+
* it will fallback to reflection invocation.
3837
*
3938
* By default, on initialization, the class will register itself as an {@link Instantiator} through
4039
* {@link #register(Instantiator)}. This behaviour can be disabled through {@link #setAutoRegister(boolean)}.
4140
* Additionally, the instantiator registration is not distributed by default, to allow the application context
4241
* to be reused. This can be changed through {@link #setDistribute(boolean)}.
4342
*
43+
* @author Costin Leau
4444
* @see org.springframework.beans.factory.wiring.BeanConfigurerSupport
4545
* @see org.springframework.beans.factory.wiring.BeanWiringInfoResolver
4646
* @see org.springframework.beans.factory.annotation.Autowired
47-
* @see javax.annotation.Resource
48-
*
49-
* @author Costin Leau
5047
*/
5148
public class WiringInstantiator extends Instantiator implements BeanFactoryAware, InitializingBean, DisposableBean {
5249

Diff for: ‎spring-data-geode/src/test/java/org/springframework/data/gemfire/cache/CachingWithGemFireIntegrationTests.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,21 @@
1414
* limitations under the License.
1515
*
1616
*/
17-
1817
package org.springframework.data.gemfire.cache;
1918

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

2221
import java.util.Map;
2322

24-
import javax.annotation.PostConstruct;
25-
import javax.annotation.Resource;
23+
import jakarta.annotation.PostConstruct;
2624

2725
import org.junit.Test;
2826
import org.junit.runner.RunWith;
2927

3028
import org.apache.geode.cache.Region;
3129

3230
import org.springframework.beans.factory.annotation.Autowired;
31+
import org.springframework.beans.factory.annotation.Qualifier;
3332
import org.springframework.cache.annotation.Cacheable;
3433
import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport;
3534
import org.springframework.test.context.ActiveProfiles;
@@ -60,11 +59,12 @@ public class CachingWithGemFireIntegrationTests extends IntegrationTestsSupport
6059
@Autowired
6160
private NamedNumbersService namedNumbersService;
6261

63-
@Resource(name = "NamedNumbersRegion")
62+
@Autowired
63+
@Qualifier("NamedNumbersRegion")
6464
private Region<String, Integer> namedNumbersRegion;
6565

6666
@Test(expected = NullPointerException.class)
67-
public void testRegionCacheHit() {
67+
public void regionCacheHitIsCorrect() {
6868

6969
assertThat(namedNumbersRegion.get("eleven")).isNull();
7070
assertThat(namedNumbersRegion.containsKey("eleven")).isFalse();
@@ -87,7 +87,7 @@ public void testRegionCacheHit() {
8787
}
8888

8989
@Test
90-
public void testRegionCaching() {
90+
public void regionCachingIsCorrect() {
9191

9292
assertThat(namedNumbersService.wasCacheMiss()).isFalse();
9393
assertThat(namedNumbersService.get("one").intValue()).isEqualTo(1);

Diff for: ‎spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/AbstractGeodeSecurityIntegrationTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import java.util.Set;
2929
import java.util.concurrent.atomic.AtomicInteger;
3030

31-
import javax.annotation.PostConstruct;
31+
import jakarta.annotation.PostConstruct;
3232

3333
import org.junit.AfterClass;
3434
import org.junit.BeforeClass;

Diff for: ‎spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/cdi/CdiExtensionIntegrationTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

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

21-
import javax.enterprise.inject.se.SeContainer;
22-
import javax.enterprise.inject.se.SeContainerInitializer;
21+
import jakarta.enterprise.inject.se.SeContainer;
22+
import jakarta.enterprise.inject.se.SeContainerInitializer;
2323

2424
import org.junit.AfterClass;
2525
import org.junit.BeforeClass;

Diff for: ‎spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireCacheRegionProducer.java

+8-7
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
* limitations under the License.
1515
*
1616
*/
17-
1817
package org.springframework.data.gemfire.repository.cdi;
1918

20-
import javax.enterprise.context.ApplicationScoped;
21-
import javax.enterprise.inject.Produces;
19+
import jakarta.enterprise.context.ApplicationScoped;
20+
import jakarta.enterprise.inject.Produces;
2221

2322
import org.apache.geode.cache.Cache;
2423
import org.apache.geode.cache.CacheFactory;
24+
import org.apache.geode.cache.GemFireCache;
2525
import org.apache.geode.cache.Region;
2626
import org.apache.geode.cache.RegionFactory;
2727
import org.apache.geode.cache.RegionShortcut;
@@ -30,14 +30,15 @@
3030
import org.springframework.util.Assert;
3131

3232
/**
33-
* The GemfireCacheRegionProducer class is an application scoped CDI context bean that is responsible
34-
* for creating the GemFire Cache "People" Region used to store {@link Person} instances.
33+
* The {@link GemfireCacheRegionProducer} class is an application scoped CDI context bean that is responsible
34+
* for creating the {@link GemFireCache} {@literal People} {@link Region} used to store {@link Person} instances.
3535
*
3636
* @author John Blum
37-
* @see javax.enterprise.context.ApplicationScoped
38-
* @see javax.enterprise.inject.Produces
37+
* @see jakarta.enterprise.context.ApplicationScoped
38+
* @see jakarta.enterprise.inject.Produces
3939
* @see org.apache.geode.cache.Cache
4040
* @see org.apache.geode.cache.CacheFactory
41+
* @see org.apache.geode.cache.GemFireCache
4142
* @see org.apache.geode.cache.Region
4243
* @see org.apache.geode.cache.RegionFactory
4344
* @since 1.8.0

0 commit comments

Comments
 (0)