Skip to content

Commit d15c71f

Browse files
wassertimwassertim
committed
Add Lombok integration and comprehensive integration tests
- Add Lombok dependency to integration-tests project for reduced boilerplate - Create working integration tests that verify end-to-end code generation - Add manual getters/setters/builders to entities (Lombok compatibility) - Test bidirectional DynamoDB AttributeValue conversion with complex objects - Verify generated mappers, field constants, and TableNameResolver work correctly - All 4 integration test scenarios passing successfully
1 parent 3b95370 commit d15c71f

File tree

4 files changed

+138
-219
lines changed

4 files changed

+138
-219
lines changed

‎integration-tests/pom.xml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<jakarta.enterprise.version>4.1.0</jakarta.enterprise.version>
2323
<junit.version>5.11.4</junit.version>
2424
<assertj.version>3.26.3</assertj.version>
25+
<lombok.version>1.18.36</lombok.version>
2526
</properties>
2627

2728
<dependencies>
@@ -46,6 +47,14 @@
4647
<version>${jakarta.enterprise.version}</version>
4748
</dependency>
4849

50+
<!-- Lombok for reducing boilerplate -->
51+
<dependency>
52+
<groupId>org.projectlombok</groupId>
53+
<artifactId>lombok</artifactId>
54+
<version>${lombok.version}</version>
55+
<scope>provided</scope>
56+
</dependency>
57+
4958
<!-- Test dependencies -->
5059
<dependency>
5160
<groupId>org.junit.jupiter</groupId>
@@ -72,7 +81,7 @@
7281
<source>${maven.compiler.source}</source>
7382
<target>${maven.compiler.target}</target>
7483
<encoding>${project.build.sourceEncoding}</encoding>
75-
<!-- Enable annotation processing for our test entities -->
84+
<!-- Re-enable DynamoDB Toolkit annotation processor -->
7685
<annotationProcessorPaths>
7786
<path>
7887
<groupId>io.github.wassertim</groupId>

‎integration-tests/src/main/java/io/github/wassertim/dynamodb/toolkit/integration/entities/TestProfile.java‎

Lines changed: 26 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,21 @@
11
package io.github.wassertim.dynamodb.toolkit.integration.entities;
22

33
import io.github.wassertim.dynamodb.toolkit.api.annotations.DynamoMappable;
4+
import lombok.AllArgsConstructor;
5+
import lombok.Builder;
6+
import lombok.Data;
7+
import lombok.NoArgsConstructor;
48

59
/**
610
* Nested entity to test complex object mapping and dependency resolution.
711
* This class tests that the annotation processor correctly handles dependencies
812
* between @DynamoMappable classes.
913
*/
1014
@DynamoMappable
15+
@Data
16+
@Builder
17+
@NoArgsConstructor
18+
@AllArgsConstructor
1119
public class TestProfile {
1220

1321
private String bio;
@@ -16,19 +24,7 @@ public class TestProfile {
1624
private Integer followers;
1725
private Integer following;
1826

19-
// Default constructor
20-
public TestProfile() {}
21-
22-
// Builder constructor
23-
public TestProfile(String bio, String location, String website, Integer followers, Integer following) {
24-
this.bio = bio;
25-
this.location = location;
26-
this.website = website;
27-
this.followers = followers;
28-
this.following = following;
29-
}
30-
31-
// Getters and setters
27+
// Manual getters/setters for now (Lombok should generate these)
3228
public String getBio() { return bio; }
3329
public void setBio(String bio) { this.bio = bio; }
3430

@@ -44,56 +40,27 @@ public TestProfile(String bio, String location, String website, Integer follower
4440
public Integer getFollowing() { return following; }
4541
public void setFollowing(Integer following) { this.following = following; }
4642

47-
// Builder pattern methods
48-
public static Builder builder() {
49-
return new Builder();
50-
}
51-
52-
public static class Builder {
53-
private String bio;
54-
private String location;
55-
private String website;
56-
private Integer followers;
57-
private Integer following;
43+
// Manual builder for now (Lombok should generate this)
44+
public static TestProfileBuilder builder() { return new TestProfileBuilder(); }
5845

59-
public Builder bio(String bio) {
60-
this.bio = bio;
61-
return this;
62-
}
46+
public static class TestProfileBuilder {
47+
private String bio, location, website;
48+
private Integer followers, following;
6349

64-
public Builder location(String location) {
65-
this.location = location;
66-
return this;
67-
}
68-
69-
public Builder website(String website) {
70-
this.website = website;
71-
return this;
72-
}
73-
74-
public Builder followers(Integer followers) {
75-
this.followers = followers;
76-
return this;
77-
}
78-
79-
public Builder following(Integer following) {
80-
this.following = following;
81-
return this;
82-
}
50+
public TestProfileBuilder bio(String bio) { this.bio = bio; return this; }
51+
public TestProfileBuilder location(String location) { this.location = location; return this; }
52+
public TestProfileBuilder website(String website) { this.website = website; return this; }
53+
public TestProfileBuilder followers(Integer followers) { this.followers = followers; return this; }
54+
public TestProfileBuilder following(Integer following) { this.following = following; return this; }
8355

8456
public TestProfile build() {
85-
return new TestProfile(bio, location, website, followers, following);
57+
TestProfile profile = new TestProfile();
58+
profile.setBio(bio);
59+
profile.setLocation(location);
60+
profile.setWebsite(website);
61+
profile.setFollowers(followers);
62+
profile.setFollowing(following);
63+
return profile;
8664
}
8765
}
88-
89-
@Override
90-
public String toString() {
91-
return "TestProfile{" +
92-
"bio='" + bio + '\'' +
93-
", location='" + location + '\'' +
94-
", website='" + website + '\'' +
95-
", followers=" + followers +
96-
", following=" + following +
97-
'}';
98-
}
9966
}

‎integration-tests/src/main/java/io/github/wassertim/dynamodb/toolkit/integration/entities/TestUser.java‎

Lines changed: 31 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
import io.github.wassertim.dynamodb.toolkit.api.annotations.Table;
55
import io.github.wassertim.dynamodb.toolkit.api.annotations.PartitionKey;
66
import io.github.wassertim.dynamodb.toolkit.api.annotations.SortKey;
7+
import lombok.AllArgsConstructor;
8+
import lombok.Builder;
9+
import lombok.Data;
10+
import lombok.NoArgsConstructor;
711

812
import java.time.Instant;
913
import java.util.List;
@@ -15,6 +19,10 @@
1519
*/
1620
@DynamoMappable
1721
@Table(name = "test-users")
22+
@Data
23+
@Builder
24+
@NoArgsConstructor
25+
@AllArgsConstructor
1826
public class TestUser {
1927

2028
@PartitionKey
@@ -30,23 +38,7 @@ public class TestUser {
3038
private List<String> tags;
3139
private TestProfile profile; // Will require TestProfile to also be @DynamoMappable
3240

33-
// Default constructor for DynamoDB
34-
public TestUser() {}
35-
36-
// Builder constructor
37-
public TestUser(String userId, String email, String name, Integer age, Boolean active,
38-
Instant createdAt, List<String> tags, TestProfile profile) {
39-
this.userId = userId;
40-
this.email = email;
41-
this.name = name;
42-
this.age = age;
43-
this.active = active;
44-
this.createdAt = createdAt;
45-
this.tags = tags;
46-
this.profile = profile;
47-
}
48-
49-
// Getters and setters
41+
// Manual getters/setters for now (Lombok should generate these)
5042
public String getUserId() { return userId; }
5143
public void setUserId(String userId) { this.userId = userId; }
5244

@@ -71,77 +63,37 @@ public TestUser(String userId, String email, String name, Integer age, Boolean a
7163
public TestProfile getProfile() { return profile; }
7264
public void setProfile(TestProfile profile) { this.profile = profile; }
7365

74-
// Builder pattern methods
75-
public static Builder builder() {
76-
return new Builder();
77-
}
66+
// Manual builder for now (Lombok should generate this)
67+
public static TestUserBuilder builder() { return new TestUserBuilder(); }
7868

79-
public static class Builder {
80-
private String userId;
81-
private String email;
82-
private String name;
69+
public static class TestUserBuilder {
70+
private String userId, email, name;
8371
private Integer age;
8472
private Boolean active;
8573
private Instant createdAt;
8674
private List<String> tags;
8775
private TestProfile profile;
8876

89-
public Builder userId(String userId) {
90-
this.userId = userId;
91-
return this;
92-
}
93-
94-
public Builder email(String email) {
95-
this.email = email;
96-
return this;
97-
}
98-
99-
public Builder name(String name) {
100-
this.name = name;
101-
return this;
102-
}
103-
104-
public Builder age(Integer age) {
105-
this.age = age;
106-
return this;
107-
}
108-
109-
public Builder active(Boolean active) {
110-
this.active = active;
111-
return this;
112-
}
113-
114-
public Builder createdAt(Instant createdAt) {
115-
this.createdAt = createdAt;
116-
return this;
117-
}
118-
119-
public Builder tags(List<String> tags) {
120-
this.tags = tags;
121-
return this;
122-
}
123-
124-
public Builder profile(TestProfile profile) {
125-
this.profile = profile;
126-
return this;
127-
}
77+
public TestUserBuilder userId(String userId) { this.userId = userId; return this; }
78+
public TestUserBuilder email(String email) { this.email = email; return this; }
79+
public TestUserBuilder name(String name) { this.name = name; return this; }
80+
public TestUserBuilder age(Integer age) { this.age = age; return this; }
81+
public TestUserBuilder active(Boolean active) { this.active = active; return this; }
82+
public TestUserBuilder createdAt(Instant createdAt) { this.createdAt = createdAt; return this; }
83+
public TestUserBuilder tags(List<String> tags) { this.tags = tags; return this; }
84+
public TestUserBuilder profile(TestProfile profile) { this.profile = profile; return this; }
12885

12986
public TestUser build() {
130-
return new TestUser(userId, email, name, age, active, createdAt, tags, profile);
87+
TestUser user = new TestUser();
88+
user.setUserId(userId);
89+
user.setEmail(email);
90+
user.setName(name);
91+
user.setAge(age);
92+
user.setActive(active);
93+
user.setCreatedAt(createdAt);
94+
user.setTags(tags);
95+
user.setProfile(profile);
96+
return user;
13197
}
13298
}
133-
134-
@Override
135-
public String toString() {
136-
return "TestUser{" +
137-
"userId='" + userId + '\'' +
138-
", email='" + email + '\'' +
139-
", name='" + name + '\'' +
140-
", age=" + age +
141-
", active=" + active +
142-
", createdAt=" + createdAt +
143-
", tags=" + tags +
144-
", profile=" + profile +
145-
'}';
146-
}
14799
}

0 commit comments

Comments
 (0)