Skip to content

Commit f32c605

Browse files
jxblumjxblum
committed
Change all Java EE 8 javax imports to Jakarta EE 9 jakarta imports.
Note, some javax imports (such as javax.annotation.*) are part of the Java SE framework and do not change. Resolves spring-projectsgh-2464.
1 parent 7c3b8cd commit f32c605

23 files changed

+80
-80
lines changed

Diff for: ‎src/main/java/org/springframework/data/domain/jaxb/OrderAdapter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package org.springframework.data.domain.jaxb;
1717

18-
import javax.xml.bind.annotation.adapters.XmlAdapter;
18+
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
1919

2020
import org.springframework.data.domain.Sort.Direction;
2121
import org.springframework.data.domain.Sort.Order;

Diff for: ‎src/main/java/org/springframework/data/domain/jaxb/PageAdapter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import java.util.Collections;
1919
import java.util.List;
2020

21-
import javax.xml.bind.annotation.adapters.XmlAdapter;
21+
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
2222

2323
import org.springframework.data.domain.Page;
2424
import org.springframework.data.domain.jaxb.SpringDataJaxb.PageDto;

Diff for: ‎src/main/java/org/springframework/data/domain/jaxb/PageableAdapter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
import java.util.Collections;
1919

20-
import javax.xml.bind.annotation.adapters.XmlAdapter;
20+
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
2121

2222
import org.springframework.data.domain.PageRequest;
2323
import org.springframework.data.domain.Pageable;

Diff for: ‎src/main/java/org/springframework/data/domain/jaxb/SortAdapter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package org.springframework.data.domain.jaxb;
1717

18-
import javax.xml.bind.annotation.adapters.XmlAdapter;
18+
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
1919

2020
import org.springframework.data.domain.Sort;
2121
import org.springframework.data.domain.jaxb.SpringDataJaxb.SortDto;

Diff for: ‎src/main/java/org/springframework/data/domain/jaxb/SpringDataJaxb.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020
import java.util.Collections;
2121
import java.util.List;
2222

23-
import javax.xml.bind.annotation.XmlAccessType;
24-
import javax.xml.bind.annotation.XmlAccessorType;
25-
import javax.xml.bind.annotation.XmlAnyElement;
26-
import javax.xml.bind.annotation.XmlAttribute;
27-
import javax.xml.bind.annotation.XmlElement;
28-
import javax.xml.bind.annotation.XmlElementWrapper;
29-
import javax.xml.bind.annotation.XmlRootElement;
30-
import javax.xml.bind.annotation.adapters.XmlAdapter;
23+
import jakarta.xml.bind.annotation.XmlAccessType;
24+
import jakarta.xml.bind.annotation.XmlAccessorType;
25+
import jakarta.xml.bind.annotation.XmlAnyElement;
26+
import jakarta.xml.bind.annotation.XmlAttribute;
27+
import jakarta.xml.bind.annotation.XmlElement;
28+
import jakarta.xml.bind.annotation.XmlElementWrapper;
29+
import jakarta.xml.bind.annotation.XmlRootElement;
30+
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
3131

3232
import org.springframework.data.domain.Page;
3333
import org.springframework.data.domain.PageRequest;

Diff for: ‎src/main/java/org/springframework/data/domain/jaxb/package-info.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
@org.springframework.lang.NonNullApi
1414
package org.springframework.data.domain.jaxb;
1515

16-
import javax.xml.bind.annotation.XmlNs;
17-
import javax.xml.bind.annotation.XmlSchema;
18-
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
19-
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
16+
import jakarta.xml.bind.annotation.XmlNs;
17+
import jakarta.xml.bind.annotation.XmlSchema;
18+
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
19+
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
2020

2121
import org.springframework.data.domain.Page;
2222
import org.springframework.data.domain.Pageable;

Diff for: ‎src/main/java/org/springframework/data/repository/cdi/CdiRepositoryBean.java

+20-20
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@
2828
import java.util.stream.Collectors;
2929
import java.util.stream.Stream;
3030

31-
import javax.enterprise.context.ApplicationScoped;
32-
import javax.enterprise.context.spi.CreationalContext;
33-
import javax.enterprise.inject.Alternative;
34-
import javax.enterprise.inject.Stereotype;
35-
import javax.enterprise.inject.spi.Bean;
36-
import javax.enterprise.inject.spi.BeanManager;
37-
import javax.enterprise.inject.spi.InjectionPoint;
38-
import javax.enterprise.inject.spi.PassivationCapable;
31+
import jakarta.enterprise.context.ApplicationScoped;
32+
import jakarta.enterprise.context.spi.CreationalContext;
33+
import jakarta.enterprise.inject.Alternative;
34+
import jakarta.enterprise.inject.Stereotype;
35+
import jakarta.enterprise.inject.spi.Bean;
36+
import jakarta.enterprise.inject.spi.BeanManager;
37+
import jakarta.enterprise.inject.spi.InjectionPoint;
38+
import jakarta.enterprise.inject.spi.PassivationCapable;
3939

4040
import org.apache.commons.logging.Log;
4141
import org.apache.commons.logging.LogFactory;
@@ -155,7 +155,7 @@ private String createPassivationId(Set<Annotation> qualifiers, Class<?> reposito
155155

156156
/*
157157
* (non-Javadoc)
158-
* @see javax.enterprise.inject.spi.Bean#getTypes()
158+
* @see jakarta.enterprise.inject.spi.Bean#getTypes()
159159
*/
160160
@SuppressWarnings("rawtypes")
161161
public Set<Type> getTypes() {
@@ -204,7 +204,7 @@ public final void initialize() {
204204

205205
/*
206206
* (non-Javadoc)
207-
* @see javax.enterprise.context.spi.Contextual#create(javax.enterprise.context.spi.CreationalContext)
207+
* @see jakarta.enterprise.context.spi.Contextual#create(jakarta.enterprise.context.spi.CreationalContext)
208208
*/
209209
public final T create(@SuppressWarnings("null") CreationalContext<T> creationalContext) {
210210

@@ -224,7 +224,7 @@ public final T create(@SuppressWarnings("null") CreationalContext<T> creationalC
224224

225225
/*
226226
* (non-Javadoc)
227-
* @see javax.enterprise.context.spi.Contextual#destroy(java.lang.Object, javax.enterprise.context.spi.CreationalContext)
227+
* @see jakarta.enterprise.context.spi.Contextual#destroy(java.lang.Object, jakarta.enterprise.context.spi.CreationalContext)
228228
*/
229229
public void destroy(@SuppressWarnings("null") T instance,
230230
@SuppressWarnings("null") CreationalContext<T> creationalContext) {
@@ -239,23 +239,23 @@ public void destroy(@SuppressWarnings("null") T instance,
239239

240240
/*
241241
* (non-Javadoc)
242-
* @see javax.enterprise.inject.spi.Bean#getQualifiers()
242+
* @see jakarta.enterprise.inject.spi.Bean#getQualifiers()
243243
*/
244244
public Set<Annotation> getQualifiers() {
245245
return qualifiers;
246246
}
247247

248248
/*
249249
* (non-Javadoc)
250-
* @see javax.enterprise.inject.spi.Bean#getName()
250+
* @see jakarta.enterprise.inject.spi.Bean#getName()
251251
*/
252252
public String getName() {
253253
return repositoryType.getName();
254254
}
255255

256256
/*
257257
* (non-Javadoc)
258-
* @see javax.enterprise.inject.spi.Bean#getStereotypes()
258+
* @see jakarta.enterprise.inject.spi.Bean#getStereotypes()
259259
*/
260260
public Set<Class<? extends Annotation>> getStereotypes() {
261261

@@ -267,47 +267,47 @@ public Set<Class<? extends Annotation>> getStereotypes() {
267267

268268
/*
269269
* (non-Javadoc)
270-
* @see javax.enterprise.inject.spi.Bean#getBeanClass()
270+
* @see jakarta.enterprise.inject.spi.Bean#getBeanClass()
271271
*/
272272
public Class<?> getBeanClass() {
273273
return repositoryType;
274274
}
275275

276276
/*
277277
* (non-Javadoc)
278-
* @see javax.enterprise.inject.spi.Bean#isAlternative()
278+
* @see jakarta.enterprise.inject.spi.Bean#isAlternative()
279279
*/
280280
public boolean isAlternative() {
281281
return repositoryType.isAnnotationPresent(Alternative.class);
282282
}
283283

284284
/*
285285
* (non-Javadoc)
286-
* @see javax.enterprise.inject.spi.Bean#isNullable()
286+
* @see jakarta.enterprise.inject.spi.Bean#isNullable()
287287
*/
288288
public boolean isNullable() {
289289
return false;
290290
}
291291

292292
/*
293293
* (non-Javadoc)
294-
* @see javax.enterprise.inject.spi.Bean#getInjectionPoints()
294+
* @see jakarta.enterprise.inject.spi.Bean#getInjectionPoints()
295295
*/
296296
public Set<InjectionPoint> getInjectionPoints() {
297297
return Collections.emptySet();
298298
}
299299

300300
/*
301301
* (non-Javadoc)
302-
* @see javax.enterprise.inject.spi.Bean#getScope()
302+
* @see jakarta.enterprise.inject.spi.Bean#getScope()
303303
*/
304304
public Class<? extends Annotation> getScope() {
305305
return ApplicationScoped.class;
306306
}
307307

308308
/*
309309
* (non-Javadoc)
310-
* @see javax.enterprise.inject.spi.PassivationCapable#getId()
310+
* @see jakarta.enterprise.inject.spi.PassivationCapable#getId()
311311
*/
312312
public String getId() {
313313
return passivationId;

Diff for: ‎src/main/java/org/springframework/data/repository/cdi/CdiRepositoryContext.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import java.util.Optional;
1919
import java.util.stream.Stream;
2020

21-
import javax.enterprise.inject.UnsatisfiedResolutionException;
21+
import jakarta.enterprise.inject.UnsatisfiedResolutionException;
2222

2323
import org.springframework.beans.factory.support.AbstractBeanDefinition;
2424
import org.springframework.core.env.StandardEnvironment;

Diff for: ‎src/main/java/org/springframework/data/repository/cdi/CdiRepositoryExtensionSupport.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@
2222
import java.util.Map.Entry;
2323
import java.util.Set;
2424

25-
import javax.enterprise.event.Observes;
26-
import javax.enterprise.inject.Any;
27-
import javax.enterprise.inject.Default;
28-
import javax.enterprise.inject.spi.AfterDeploymentValidation;
29-
import javax.enterprise.inject.spi.AnnotatedType;
30-
import javax.enterprise.inject.spi.BeanManager;
31-
import javax.enterprise.inject.spi.Extension;
32-
import javax.enterprise.inject.spi.ProcessAnnotatedType;
33-
import javax.enterprise.util.AnnotationLiteral;
34-
import javax.inject.Qualifier;
25+
import jakarta.enterprise.event.Observes;
26+
import jakarta.enterprise.inject.Any;
27+
import jakarta.enterprise.inject.Default;
28+
import jakarta.enterprise.inject.spi.AfterDeploymentValidation;
29+
import jakarta.enterprise.inject.spi.AnnotatedType;
30+
import jakarta.enterprise.inject.spi.BeanManager;
31+
import jakarta.enterprise.inject.spi.Extension;
32+
import jakarta.enterprise.inject.spi.ProcessAnnotatedType;
33+
import jakarta.enterprise.util.AnnotationLiteral;
34+
import jakarta.inject.Qualifier;
3535

3636
import org.apache.commons.logging.Log;
3737
import org.apache.commons.logging.LogFactory;

Diff for: ‎src/test/java/org/springframework/data/domain/jaxb/SpringDataJaxbUnitTests.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@
2424
import java.util.List;
2525
import java.util.Scanner;
2626

27-
import javax.xml.bind.JAXBContext;
28-
import javax.xml.bind.Marshaller;
29-
import javax.xml.bind.Unmarshaller;
30-
import javax.xml.bind.annotation.XmlAccessType;
31-
import javax.xml.bind.annotation.XmlAccessorType;
32-
import javax.xml.bind.annotation.XmlAttribute;
33-
import javax.xml.bind.annotation.XmlElement;
34-
import javax.xml.bind.annotation.XmlRootElement;
35-
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
27+
import jakarta.xml.bind.JAXBContext;
28+
import jakarta.xml.bind.Marshaller;
29+
import jakarta.xml.bind.Unmarshaller;
30+
import jakarta.xml.bind.annotation.XmlAccessType;
31+
import jakarta.xml.bind.annotation.XmlAccessorType;
32+
import jakarta.xml.bind.annotation.XmlAttribute;
33+
import jakarta.xml.bind.annotation.XmlElement;
34+
import jakarta.xml.bind.annotation.XmlRootElement;
35+
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
3636

3737
import org.custommonkey.xmlunit.Diff;
3838
import org.junit.jupiter.api.BeforeEach;

Diff for: ‎src/test/java/org/springframework/data/mapping/context/PersistentPropertyPathFactoryUnitTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
import java.util.List;
2121

22-
import javax.inject.Inject;
22+
import jakarta.inject.Inject;
2323

2424
import org.junit.jupiter.api.Test;
2525
import org.springframework.data.annotation.Reference;

Diff for: ‎src/test/java/org/springframework/data/repository/cdi/CdiConfigurationIntegrationTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
import static org.assertj.core.api.Assertions.*;
1919

20-
import javax.enterprise.inject.se.SeContainer;
21-
import javax.enterprise.inject.se.SeContainerInitializer;
20+
import jakarta.enterprise.inject.se.SeContainer;
21+
import jakarta.enterprise.inject.se.SeContainerInitializer;
2222

2323
import org.junit.jupiter.api.AfterAll;
2424
import org.junit.jupiter.api.BeforeAll;

Diff for: ‎src/test/java/org/springframework/data/repository/cdi/CdiRepositoryBeanUnitTests.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626
import java.util.Optional;
2727
import java.util.Set;
2828

29-
import javax.enterprise.context.ApplicationScoped;
30-
import javax.enterprise.context.spi.CreationalContext;
31-
import javax.enterprise.inject.spi.Bean;
32-
import javax.enterprise.inject.spi.BeanManager;
33-
import javax.inject.Named;
29+
import jakarta.enterprise.context.ApplicationScoped;
30+
import jakarta.enterprise.context.spi.CreationalContext;
31+
import jakarta.enterprise.inject.spi.Bean;
32+
import jakarta.enterprise.inject.spi.BeanManager;
33+
import jakarta.inject.Named;
3434

3535
import org.junit.jupiter.api.Test;
3636
import org.junit.jupiter.api.extension.ExtendWith;

Diff for: ‎src/test/java/org/springframework/data/repository/cdi/DummyCdiExtension.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
import java.util.Optional;
2424
import java.util.Set;
2525

26-
import javax.enterprise.context.NormalScope;
27-
import javax.enterprise.context.spi.CreationalContext;
28-
import javax.enterprise.event.Observes;
29-
import javax.enterprise.inject.spi.AfterBeanDiscovery;
30-
import javax.enterprise.inject.spi.BeanManager;
26+
import jakarta.enterprise.context.NormalScope;
27+
import jakarta.enterprise.context.spi.CreationalContext;
28+
import jakarta.enterprise.event.Observes;
29+
import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
30+
import jakarta.enterprise.inject.spi.BeanManager;
3131

3232
import org.apache.webbeans.context.AbstractContext;
3333
import org.mockito.Mockito;

Diff for: ‎src/test/java/org/springframework/data/repository/cdi/RepositoryClient.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package org.springframework.data.repository.cdi;
1717

18-
import javax.inject.Inject;
18+
import jakarta.inject.Inject;
1919

2020
/**
2121
*

Diff for: ‎src/test/java/org/springframework/data/repository/cdi/RepositoryFragmentsIntegrationTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
import java.io.Serializable;
2121

22-
import javax.enterprise.inject.se.SeContainer;
23-
import javax.enterprise.inject.se.SeContainerInitializer;
22+
import jakarta.enterprise.inject.se.SeContainer;
23+
import jakarta.enterprise.inject.se.SeContainerInitializer;
2424

2525
import org.junit.jupiter.api.AfterAll;
2626
import org.junit.jupiter.api.BeforeAll;

Diff for: ‎src/test/java/org/springframework/data/repository/cdi/StereotypeAnnotation.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import java.lang.annotation.Retention;
1919
import java.lang.annotation.RetentionPolicy;
2020

21-
import javax.enterprise.inject.Stereotype;
21+
import jakarta.enterprise.inject.Stereotype;
2222

2323
@Stereotype
2424
@Retention(RetentionPolicy.RUNTIME)

Diff for: ‎src/test/java/org/springframework/data/repository/cdi/WebbeansCdiRepositoryExtensionSupportIntegrationTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
*/
1616
package org.springframework.data.repository.cdi;
1717

18-
import javax.enterprise.inject.se.SeContainer;
19-
import javax.enterprise.inject.se.SeContainerInitializer;
18+
import jakarta.enterprise.inject.se.SeContainer;
19+
import jakarta.enterprise.inject.se.SeContainerInitializer;
2020

2121
import org.junit.jupiter.api.AfterAll;
2222
import org.junit.jupiter.api.BeforeAll;

Diff for: ‎src/test/java/org/springframework/data/repository/config/RepositoryBeanNameGeneratorUnitTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
import java.io.IOException;
2121

22-
import javax.inject.Named;
22+
import jakarta.inject.Named;
2323

2424
import org.junit.jupiter.api.BeforeEach;
2525
import org.junit.jupiter.api.Test;

Diff for: ‎src/test/java/org/springframework/data/repository/core/support/TransactionRepositoryProxyPostProcessorUnitTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ interface SampleRepository extends Repository<Sample, Serializable> {
115115

116116
Sample save(Sample object);
117117

118-
@javax.transaction.Transactional
118+
@jakarta.transaction.Transactional
119119
void methodWithJtaOneDotTwoAtTransactional();
120120
}
121121

Diff for: ‎src/test/java/org/springframework/data/web/PageableDefaultUnitTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import static org.assertj.core.api.Assertions.*;
1919
import static org.springframework.data.web.SortDefaultUnitTests.*;
2020

21-
import javax.servlet.http.HttpServletRequest;
21+
import jakarta.servlet.http.HttpServletRequest;
2222

2323
import org.junit.jupiter.api.Test;
2424

Diff for: ‎src/test/java/org/springframework/data/web/SortHandlerMethodArgumentResolverUnitTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
import java.util.stream.Stream;
2222

23-
import javax.servlet.http.HttpServletRequest;
23+
import jakarta.servlet.http.HttpServletRequest;
2424

2525
import org.junit.jupiter.api.BeforeAll;
2626
import org.junit.jupiter.api.Test;

0 commit comments

Comments
 (0)