Skip to content

Commit a38ae67

Browse files
Treppenhouseschauder
authored andcommitted
DATAJPA-1813 - Removes dependency to joda.time
The last remaining usages in a test are replaced with a java.time equivalent. Original pull request: spring-projects#434.
1 parent 912abd8 commit a38ae67

File tree

4 files changed

+10
-16
lines changed

4 files changed

+10
-16
lines changed

Diff for: pom.xml

-7
Original file line numberDiff line numberDiff line change
@@ -190,13 +190,6 @@
190190
<scope>test</scope>
191191
</dependency>
192192

193-
<dependency>
194-
<groupId>joda-time</groupId>
195-
<artifactId>joda-time</artifactId>
196-
<version>${jodatime}</version>
197-
<optional>true</optional>
198-
</dependency>
199-
200193
<dependency>
201194
<groupId>org.threeten</groupId>
202195
<artifactId>threetenbp</artifactId>

Diff for: src/test/java/org/springframework/data/jpa/repository/support/QuerydslJpaPredicateExecutorUnitTests.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,13 @@
1717

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

20+
import java.sql.Date;
2021
import java.util.List;
2122

2223
import javax.persistence.EntityManager;
2324
import javax.persistence.PersistenceContext;
2425

25-
import org.joda.time.LocalDate;
26+
import java.time.LocalDate;
2627
import org.junit.jupiter.api.BeforeEach;
2728
import org.junit.jupiter.api.Test;
2829
import org.junit.jupiter.api.extension.ExtendWith;
@@ -249,9 +250,9 @@ void sortByNestedEmbeddedAttribute() {
249250
@Test // DATAJPA-566, DATAJPA-635
250251
void shouldSupportSortByOperatorWithDateExpressions() {
251252

252-
carter.setDateOfBirth(new LocalDate(2000, 2, 1).toDate());
253-
dave.setDateOfBirth(new LocalDate(2000, 1, 1).toDate());
254-
oliver.setDateOfBirth(new LocalDate(2003, 5, 1).toDate());
253+
carter.setDateOfBirth(Date.valueOf(LocalDate.of(2000, 2, 1)));
254+
dave.setDateOfBirth(Date.valueOf(LocalDate.of(2000, 1, 1)));
255+
oliver.setDateOfBirth(Date.valueOf(LocalDate.of(2003, 5, 1)));
255256

256257
List<User> users = predicateExecutor.findAll(QUser.user.dateOfBirth.yearMonth().asc());
257258

Diff for: src/test/java/org/springframework/data/jpa/repository/support/QuerydslJpaRepositoryTests.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,13 @@
1717

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

20+
import java.sql.Date;
2021
import java.util.List;
2122

2223
import javax.persistence.EntityManager;
2324
import javax.persistence.PersistenceContext;
2425

25-
import org.joda.time.LocalDate;
26+
import java.time.LocalDate;
2627
import org.junit.jupiter.api.BeforeEach;
2728
import org.junit.jupiter.api.Test;
2829
import org.junit.jupiter.api.extension.ExtendWith;
@@ -257,9 +258,9 @@ void sortByNestedEmbeddedAttribute() {
257258
@Test // DATAJPA-566, DATAJPA-635
258259
void shouldSupportSortByOperatorWithDateExpressions() {
259260

260-
carter.setDateOfBirth(new LocalDate(2000, 2, 1).toDate());
261-
dave.setDateOfBirth(new LocalDate(2000, 1, 1).toDate());
262-
oliver.setDateOfBirth(new LocalDate(2003, 5, 1).toDate());
261+
carter.setDateOfBirth(Date.valueOf(LocalDate.of(2000, 2, 1)));
262+
dave.setDateOfBirth(Date.valueOf(LocalDate.of(2000, 1, 1)));
263+
oliver.setDateOfBirth(Date.valueOf(LocalDate.of(2003, 5, 1)));
263264

264265
List<User> users = repository.findAll(QUser.user.dateOfBirth.yearMonth().asc());
265266

Diff for: template.mf

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ Import-Template:
1616
org.aspectj.*;version="${aspectj:[=.=.=,+1.0.0)}";resolution:=optional,
1717
org.eclipse.persistence.*;version="${eclipselink:[=.=.=,+1.0.0)}";resolution:=optional,
1818
org.hibernate.*;version="[3.6.10,4.4.0)";resolution:=optional,
19-
org.joda.time.*;version="${jodatime:[=.=.=,+1.0.0)}";resolution:=optional,
2019
org.slf4j.*;version="${slf4j:[=.=.=,+1.0.0)}",
2120
org.springframework.*;version="${spring:[=.=.=.=,+1.1.0)}",
2221
org.springframework.beans.factory.aspectj;version="${spring:[=.=.=.=,+1.1.0)}";resolution:=optional,

0 commit comments

Comments
 (0)