refactor jpa mappers

Author: david-rojo

src/main/java/com/mastercloudapps/twitterscheduler/infrastructure/jpa/pending/PendingTweetJpaMapper.java

@@ -16,13 +16,14 @@ public PendingTweet mapEntity(final PendingTweetJpaEntity pendingTweetEntity) {
 			throw new RepositoryException("Empty entity");
 		}
 
-		return PendingTweet
+		final var builder = PendingTweet
 				.builder()
 				.id(pendingTweetEntity.getId())
 				.message(pendingTweetEntity.getMessage())
 				.publicationDate(pendingTweetEntity.getPublicationDate())
-				.createdAt(pendingTweetEntity.getCreatedAt())
-				.build();
+				.createdAt(pendingTweetEntity.getCreatedAt());
+		
+		return builder.build();
 	}
 
 	public PendingTweetJpaEntity mapCreatePendingTweet(final PendingTweet pendingTweet) {
@@ -31,12 +32,13 @@ public PendingTweetJpaEntity mapCreatePendingTweet(final PendingTweet pendingTwe
 			throw new RepositoryException("Empty domain object");
 		}
 
-		return PendingTweetJpaEntity
+		final var builder = PendingTweetJpaEntity
 				.builder()
 				.message(pendingTweet.message().message())
 				.publicationDate(pendingTweet.publicationDate().instant())
-				.createdAt(pendingTweet.createdAt().instant())
-				.build();
+				.createdAt(pendingTweet.createdAt().instant());
+		
+		return builder.build();
 	}
 
 	public PendingTweetJpaEntity mapDomainObject(final PendingTweet pendingTweet) {
@@ -45,13 +47,14 @@ public PendingTweetJpaEntity mapDomainObject(final PendingTweet pendingTweet) {
 			throw new RepositoryException("Empty domain object");
 		}
 
-		return PendingTweetJpaEntity
+		final var builder = PendingTweetJpaEntity
 				.builder()
 				.id(pendingTweet.id().id())
 				.message(pendingTweet.message().message())
 				.publicationDate(pendingTweet.publicationDate().instant())
-				.createdAt(pendingTweet.createdAt().instant())
-				.build();
+				.createdAt(pendingTweet.createdAt().instant());
+		
+		return builder.build();
 	}
 
-}
+}

src/main/java/com/mastercloudapps/twitterscheduler/infrastructure/jpa/tweet/TweetJpaMapper.java

@@ -16,16 +16,17 @@ public Tweet mapEntity(final TweetJpaEntity tweetEntity) {
 			throw new RepositoryException("Empty entity");
 		}
 
-		return Tweet
+		final var builder = Tweet
 				.builder()
 				.id(tweetEntity.getId())
 				.message(tweetEntity.getMessage())
 				.url(tweetEntity.getUrl())
 				.requestedPublicationDate(tweetEntity.getRequestedPublicationDate())
 				.publishedAt(tweetEntity.getPublishedAt())
 				.createdAt(tweetEntity.getCreatedAt())
-				.publicationType(tweetEntity.getPublicationType())
-				.build();
+				.publicationType(tweetEntity.getPublicationType());
+		
+		return builder.build();
 	}
 
 	public TweetJpaEntity mapDomainObject(final Tweet tweet) {
@@ -34,16 +35,17 @@ public TweetJpaEntity mapDomainObject(final Tweet tweet) {
 			throw new RepositoryException("Empty domain object");
 		}
 
-		return TweetJpaEntity
+		final var builder = TweetJpaEntity
 				.builder()
 				.id(tweet.id().id())
 				.message(tweet.message().message())
 				.url(tweet.url().url())
 				.requestedPublicationDate(tweet.requestedPublicationDate().instant())
 				.publishedAt(tweet.publishedAt().instant())
 				.createdAt(tweet.createdAt().instant())
-				.publicationType(tweet.publicationType())
-				.build();
+				.publicationType(tweet.publicationType());
+		
+		return builder.build();
 	}
 
-}
+}