Skip to content

Commit dfdb528

Browse files
committed
Use Spring nullability annotations instead of JSR305.
Closes #2239.
1 parent 316d0ce commit dfdb528

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

src/main/java/org/springframework/data/jpa/repository/query/NativeJpaQuery.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616
package org.springframework.data.jpa.repository.query;
1717

18-
import javax.annotation.Nullable;
1918
import javax.persistence.EntityManager;
2019
import javax.persistence.Query;
2120
import javax.persistence.Tuple;
@@ -25,6 +24,7 @@
2524
import org.springframework.data.repository.query.RepositoryQuery;
2625
import org.springframework.data.repository.query.ReturnedType;
2726
import org.springframework.expression.spel.standard.SpelExpressionParser;
27+
import org.springframework.lang.Nullable;
2828

2929
/**
3030
* {@link RepositoryQuery} implementation that inspects a {@link org.springframework.data.repository.query.QueryMethod}

src/main/java/org/springframework/data/jpa/repository/support/QuerydslRepositorySupport.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
*/
1616
package org.springframework.data.jpa.repository.support;
1717

18-
import javax.annotation.Nullable;
1918
import javax.annotation.PostConstruct;
2019
import javax.persistence.EntityManager;
2120

2221
import org.springframework.beans.factory.annotation.Autowired;
22+
import org.springframework.lang.Nullable;
2323
import org.springframework.stereotype.Repository;
2424
import org.springframework.util.Assert;
2525

src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import java.util.HashSet;
3131
import java.util.List;
3232
import java.util.Map;
33+
import java.util.Optional;
3334
import java.util.Set;
3435
import java.util.stream.Stream;
3536

@@ -46,6 +47,7 @@
4647
import org.junit.jupiter.api.Disabled;
4748
import org.junit.jupiter.api.Test;
4849
import org.junit.jupiter.api.extension.ExtendWith;
50+
4951
import org.springframework.beans.factory.annotation.Autowired;
5052
import org.springframework.dao.DataAccessException;
5153
import org.springframework.dao.DataIntegrityViolationException;
@@ -59,22 +61,20 @@
5961
import org.springframework.data.domain.Pageable;
6062
import org.springframework.data.domain.Slice;
6163
import org.springframework.data.domain.Sort;
62-
import org.springframework.data.domain.ExampleMatcher.*;
6364
import org.springframework.data.domain.Sort.Direction;
6465
import org.springframework.data.domain.Sort.Order;
6566
import org.springframework.data.jpa.domain.Specification;
6667
import org.springframework.data.jpa.domain.sample.Address;
6768
import org.springframework.data.jpa.domain.sample.Role;
6869
import org.springframework.data.jpa.domain.sample.SpecialUser;
6970
import org.springframework.data.jpa.domain.sample.User;
70-
import org.springframework.data.jpa.repository.sample.UserRepository;
7171
import org.springframework.data.jpa.repository.sample.SampleEvaluationContextExtension.SampleSecurityContextHolder;
72+
import org.springframework.data.jpa.repository.sample.UserRepository;
7273
import org.springframework.data.jpa.repository.sample.UserRepository.NameOnly;
7374
import org.springframework.test.context.ContextConfiguration;
7475
import org.springframework.test.context.junit.jupiter.SpringExtension;
7576
import org.springframework.transaction.annotation.Transactional;
7677

77-
import com.google.common.base.Optional;
7878

7979
/**
8080
* Base integration test class for {@code UserRepository}. Loads a basic (non-namespace) Spring configuration file as

src/test/java/org/springframework/data/jpa/repository/sample/UserRepository.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import java.util.Date;
2020
import java.util.List;
2121
import java.util.Map;
22+
import java.util.Optional;
2223
import java.util.Set;
2324
import java.util.stream.Stream;
2425

@@ -42,8 +43,6 @@
4243
import org.springframework.data.repository.query.Param;
4344
import org.springframework.transaction.annotation.Transactional;
4445

45-
import com.google.common.base.Optional;
46-
4746
/**
4847
* Repository interface for {@code User}s.
4948
*

0 commit comments

Comments
 (0)