Skip to content

Commit a54bfb7

Browse files
committed
De-lombok test code.
Closes #395
1 parent bb1d763 commit a54bfb7

File tree

4 files changed

+39
-43
lines changed

4 files changed

+39
-43
lines changed

src/test/java/org/springframework/data/ldap/repository/LdapRepositoryUnitTests.java

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
import static org.mockito.ArgumentMatchers.*;
2020
import static org.mockito.Mockito.*;
2121

22-
import lombok.Data;
23-
2422
import java.util.Collections;
2523
import java.util.List;
2624
import java.util.stream.Collectors;
@@ -33,7 +31,6 @@
3331
import org.mockito.ArgumentCaptor;
3432
import org.mockito.Mock;
3533
import org.mockito.junit.jupiter.MockitoSettings;
36-
3734
import org.springframework.data.ldap.repository.support.LdapRepositoryFactory;
3835
import org.springframework.data.ldap.repository.support.UnitTestPerson;
3936
import org.springframework.ldap.core.LdapOperations;
@@ -92,14 +89,14 @@ void shouldReturnDynamicDtoProjection() {
9289
PersonDto walter = repository.findByLastName("White", PersonDto.class);
9390

9491
assertThat(walter).isNotNull();
95-
assertThat(walter.getLastName()).isEqualTo("White");
92+
assertThat(walter.lastName()).isEqualTo("White");
9693

9794
ArgumentCaptor<LdapQuery> captor = ArgumentCaptor.forClass(LdapQuery.class);
9895

9996
verify(ldapOperations).findOne(captor.capture(), any());
10097

10198
LdapQuery query = captor.getValue();
102-
assertThat(query.attributes()).isNullOrEmpty();
99+
assertThat(query.attributes()).contains("lastName");
103100
}
104101

105102
@Test
@@ -135,9 +132,6 @@ interface PersonProjection {
135132
String getLastName();
136133
}
137134

138-
@Data
139-
static class PersonDto {
140-
141-
String lastName;
135+
record PersonDto(String lastName) {
142136
}
143137
}

src/test/java/org/springframework/data/ldap/repository/cdi/RepositoryClient.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,22 @@
1616
package org.springframework.data.ldap.repository.cdi;
1717

1818
import jakarta.inject.Inject;
19-
import lombok.Getter;
2019

2120
import org.springframework.ldap.core.LdapTemplate;
2221

2322
/**
2423
* @author Mark Paluch
2524
*/
26-
@Getter
2725
class RepositoryClient {
2826

2927
@Inject SampleRepository sampleRepository;
3028
@Inject LdapTemplate ldapTemplate;
29+
30+
public SampleRepository getSampleRepository() {
31+
return sampleRepository;
32+
}
33+
34+
public LdapTemplate getLdapTemplate() {
35+
return ldapTemplate;
36+
}
3137
}

src/test/java/org/springframework/data/ldap/repository/support/QuerydslLdapPredicateExecutorUnitTests.java

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
import static org.assertj.core.api.Assertions.*;
1919
import static org.mockito.Mockito.*;
2020

21-
import lombok.Data;
22-
2321
import java.util.Arrays;
2422
import java.util.Collections;
2523
import java.util.List;
@@ -33,7 +31,6 @@
3331
import org.mockito.ArgumentCaptor;
3432
import org.mockito.Mock;
3533
import org.mockito.junit.jupiter.MockitoSettings;
36-
3734
import org.springframework.dao.IncorrectResultSizeDataAccessException;
3835
import org.springframework.data.domain.Page;
3936
import org.springframework.data.domain.PageRequest;
@@ -114,7 +111,7 @@ void findByShouldReturnFirstWithProjection() {
114111
assertThat(interfaceProjection.getLastName()).isEqualTo("White");
115112

116113
PersonDto dto = repository.findBy(QPerson.person.fullName.eq("Walter"), it -> it.as(PersonDto.class).firstValue());
117-
assertThat(dto.getLastName()).isEqualTo("White");
114+
assertThat(dto.lastName()).isEqualTo("White");
118115

119116
ArgumentCaptor<LdapQuery> captor = ArgumentCaptor.forClass(LdapQuery.class);
120117

@@ -137,7 +134,7 @@ void findByShouldReturnOneWithProjection() {
137134
assertThat(interfaceProjection.getLastName()).isEqualTo("White");
138135

139136
PersonDto dto = repository.findBy(QPerson.person.fullName.eq("Walter"), it -> it.as(PersonDto.class).oneValue());
140-
assertThat(dto.getLastName()).isEqualTo("White");
137+
assertThat(dto.lastName()).isEqualTo("White");
141138

142139
ArgumentCaptor<LdapQuery> captor = ArgumentCaptor.forClass(LdapQuery.class);
143140

@@ -257,9 +254,7 @@ interface PersonProjection {
257254
String getLastName();
258255
}
259256

260-
@Data
261-
static class PersonDto {
257+
record PersonDto(String lastName) {
262258

263-
String lastName;
264259
}
265260
}

src/test/java/org/springframework/data/ldap/repository/support/UnitTestPerson.java

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@
1616

1717
package org.springframework.data.ldap.repository.support;
1818

19-
import lombok.AllArgsConstructor;
20-
import lombok.Data;
21-
import lombok.NoArgsConstructor;
22-
2319
import java.util.List;
2420

2521
import javax.naming.Name;
@@ -33,32 +29,37 @@
3329
/**
3430
* @author Mattias Hellborg Arthursson
3531
*/
36-
@Entry(objectClasses = {"inetOrgPerson", "organizationalPerson", "person", "top"})
37-
@AllArgsConstructor
38-
@NoArgsConstructor
32+
@Entry(objectClasses = { "inetOrgPerson", "organizationalPerson", "person", "top" })
33+
3934
public class UnitTestPerson {
40-
@Id
41-
private Name dn;
35+
@Id private Name dn;
36+
37+
@Attribute(name = "cn")
38+
@DnAttribute("cn") private String fullName;
4239

43-
@Attribute(name = "cn")
44-
@DnAttribute("cn")
45-
private String fullName;
40+
@Attribute(name = "sn") private String lastName;
4641

47-
@Attribute(name = "sn")
48-
private String lastName;
42+
@Attribute(name = "description") private List<String> description;
4943

50-
@Attribute(name = "description")
51-
private List<String> description;
44+
@Transient
45+
@DnAttribute("c") private String country;
5246

53-
@Transient
54-
@DnAttribute("c")
55-
private String country;
47+
@Transient
48+
@DnAttribute("ou") private String company;
5649

57-
@Transient
58-
@DnAttribute("ou")
59-
private String company;
50+
// This should be automatically found
51+
private String telephoneNumber;
6052

61-
// This should be automatically found
62-
private String telephoneNumber;
53+
public UnitTestPerson() {}
6354

55+
public UnitTestPerson(Name dn, String fullName, String lastName, List<String> description, String country,
56+
String company, String telephoneNumber) {
57+
this.dn = dn;
58+
this.fullName = fullName;
59+
this.lastName = lastName;
60+
this.description = description;
61+
this.country = country;
62+
this.company = company;
63+
this.telephoneNumber = telephoneNumber;
64+
}
6465
}

0 commit comments

Comments
 (0)