Spring/spring-data-jpa
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAJPA-1813 - Removes dependency to joda.time

Browse Source 
The last remaining usages in a test are replaced with a java.time equivalent.

Original pull request: #434.
This commit is contained in:
Malte Mauelshagen
2020-10-30 13:19:20 +01:00
committed by Jens Schauder
parent 912abd89a8
commit a38ae67c30
4 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pom.xml
View File

@@ -190,13 +190,6 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>${jodatime}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.threeten</groupId>
<artifactId>threetenbp</artifactId>

9
src/test/java/org/springframework/data/jpa/repository/support/QuerydslJpaPredicateExecutorUnitTests.java
View File

@@ -17,12 +17,13 @@ package org.springframework.data.jpa.repository.support;
import static org.assertj.core.api.Assertions.*;
import java.sql.Date;
import java.util.List;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import org.joda.time.LocalDate;
import java.time.LocalDate;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -249,9 +250,9 @@ class QuerydslJpaPredicateExecutorUnitTests {
@Test // DATAJPA-566, DATAJPA-635
void shouldSupportSortByOperatorWithDateExpressions() {
carter.setDateOfBirth(new LocalDate(2000, 2, 1).toDate());
dave.setDateOfBirth(new LocalDate(2000, 1, 1).toDate());
oliver.setDateOfBirth(new LocalDate(2003, 5, 1).toDate());
carter.setDateOfBirth(Date.valueOf(LocalDate.of(2000, 2, 1)));
dave.setDateOfBirth(Date.valueOf(LocalDate.of(2000, 1, 1)));
oliver.setDateOfBirth(Date.valueOf(LocalDate.of(2003, 5, 1)));
List<User> users = predicateExecutor.findAll(QUser.user.dateOfBirth.yearMonth().asc());

9
src/test/java/org/springframework/data/jpa/repository/support/QuerydslJpaRepositoryTests.java
View File

@@ -17,12 +17,13 @@ package org.springframework.data.jpa.repository.support;
import static org.assertj.core.api.Assertions.*;
import java.sql.Date;
import java.util.List;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import org.joda.time.LocalDate;
import java.time.LocalDate;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -257,9 +258,9 @@ class QuerydslJpaRepositoryTests {
@Test // DATAJPA-566, DATAJPA-635
void shouldSupportSortByOperatorWithDateExpressions() {
carter.setDateOfBirth(new LocalDate(2000, 2, 1).toDate());
dave.setDateOfBirth(new LocalDate(2000, 1, 1).toDate());
oliver.setDateOfBirth(new LocalDate(2003, 5, 1).toDate());
carter.setDateOfBirth(Date.valueOf(LocalDate.of(2000, 2, 1)));
dave.setDateOfBirth(Date.valueOf(LocalDate.of(2000, 1, 1)));
oliver.setDateOfBirth(Date.valueOf(LocalDate.of(2003, 5, 1)));
List<User> users = repository.findAll(QUser.user.dateOfBirth.yearMonth().asc());

1
template.mf
View File

@@ -16,7 +16,6 @@ Import-Template:
org.aspectj.*;version="${aspectj:[=.=.=,+1.0.0)}";resolution:=optional,
org.eclipse.persistence.*;version="${eclipselink:[=.=.=,+1.0.0)}";resolution:=optional,
org.hibernate.*;version="[3.6.10,4.4.0)";resolution:=optional,
org.joda.time.*;version="${jodatime:[=.=.=,+1.0.0)}";resolution:=optional,
org.slf4j.*;version="${slf4j:[=.=.=,+1.0.0)}",
org.springframework.*;version="${spring:[=.=.=.=,+1.1.0)}",
org.springframework.beans.factory.aspectj;version="${spring:[=.=.=.=,+1.1.0)}";resolution:=optional,