Refactor repositories to use dedicated mapping methods for Owners, Pets, and Vets

Author: arey

src/main/java/org/springframework/samples/petclinic/owner/OwnerRepository.java

@@ -21,6 +21,7 @@
 
 import org.jooq.DSLContext;
 import org.jooq.Field;
+import org.jooq.Record7;
 import org.springframework.samples.petclinic.system.JooqHelper;
 import org.springframework.samples.petclinic.system.Page;
 import org.springframework.samples.petclinic.system.Pageable;
@@ -96,12 +97,16 @@ public Page<Owner> findByLastNameStartingWith(String lastName, Pageable pageable
 					new Field[] { OWNERS.ID }, pageable.pageSize(), pageable.getOffset())
 			.fetch(it -> {
 				ref.totalOwners = (Integer) it.get("total_rows");
-				return new Owner(it.get(OWNERS.ID), it.get(OWNERS.FIRST_NAME), it.get(OWNERS.LAST_NAME),
-						it.get(OWNERS.ADDRESS), it.get(OWNERS.CITY), it.get(OWNERS.TELEPHONE), it.get(MULTISET_PETS));
+				return toOwner(it);
 			});
 		return new Page<>(owners, pageable, ref.totalOwners);
 	}
 
+	private static Owner toOwner(org.jooq.Record row) {
+		return new Owner(row.get(OWNERS.ID), row.get(OWNERS.FIRST_NAME), row.get(OWNERS.LAST_NAME),
+				row.get(OWNERS.ADDRESS), row.get(OWNERS.CITY), row.get(OWNERS.TELEPHONE), row.get(MULTISET_PETS));
+	}
+
 	/**
 	 * Retrieve an {@link Owner} from the data store by id.
 	 * <p>
@@ -121,10 +126,14 @@ public Optional<Owner> findById(@Nonnull Integer id) {
 					MULTISET_PETS_WITH_VISITS)
 			.from(OWNERS)
 			.where(OWNERS.ID.eq(id))
-			.fetchOptional(it -> new Owner(it.get(OWNERS.ID), it.get(OWNERS.FIRST_NAME), it.get(OWNERS.LAST_NAME),
-					it.get(OWNERS.ADDRESS), it.get(OWNERS.CITY), it.get(OWNERS.TELEPHONE),
-					it.get(MULTISET_PETS_WITH_VISITS)));
+			.fetchOptional(OwnerRepository::toOwner);
+
+	}
 
+	private static Owner toOwner(Record7<Integer, String, String, String, String, String, List<Pet>> row) {
+		return new Owner(row.get(OWNERS.ID), row.get(OWNERS.FIRST_NAME), row.get(OWNERS.LAST_NAME),
+				row.get(OWNERS.ADDRESS), row.get(OWNERS.CITY), row.get(OWNERS.TELEPHONE),
+				row.get(MULTISET_PETS_WITH_VISITS));
 	}
 
 	public Integer save(Owner owner) {

src/main/java/org/springframework/samples/petclinic/owner/PetRepository.java

@@ -48,12 +48,12 @@ public void update(Pet pet) {
 
 	@Transactional(readOnly = true)
 	public Optional<Pet> findById(Integer petId) {
-		return dsl.select()
-			.from(PETS)
-			.join(PETS.types_())
-			.where(PETS.ID.eq(petId))
-			.fetchOptional(it -> new Pet(it.get(PETS.ID), it.get(PETS.NAME), it.get(PETS.BIRTH_DATE),
-					new PetType(it.get(PETS.TYPE_ID), it.get(TYPES.NAME))));
+		return dsl.select().from(PETS).join(PETS.types_()).where(PETS.ID.eq(petId)).fetchOptional(PetRepository::toPet);
+	}
+
+	private static Pet toPet(org.jooq.Record row) {
+		return new Pet(row.get(PETS.ID), row.get(PETS.NAME), row.get(PETS.BIRTH_DATE),
+				new PetType(row.get(PETS.TYPE_ID), row.get(TYPES.NAME)));
 	}
 
 }

src/main/java/org/springframework/samples/petclinic/vet/VetRepository.java

@@ -17,6 +17,7 @@
 
 import org.jooq.DSLContext;
 import org.jooq.Field;
+import org.jooq.Record4;
 import org.jooq.exception.DataAccessException;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.samples.petclinic.system.JooqHelper;
@@ -76,8 +77,12 @@ public List<Vet> findAll() throws DataAccessException {
 			.from(VETS)
 			.leftJoin(VETS.vetSpecialties())
 			.orderBy(VETS.ID)
-			.fetch(it -> new Vet(it.get(VETS.ID), it.get(VETS.FIRST_NAME), it.get(VETS.LAST_NAME),
-					new HashSet<>(it.get(MULTISET_SPECIALITIES))));
+			.fetch(VetRepository::toVet);
+	}
+
+	private static Vet toVet(Record4<Integer, String, String, List<Specialty>> row) {
+		return new Vet(row.get(VETS.ID), row.get(VETS.FIRST_NAME), row.get(VETS.LAST_NAME),
+				new HashSet<>(row.get(MULTISET_SPECIALITIES)));
 	}
 
 	/**
@@ -98,10 +103,14 @@ public Page<Vet> findAll(Pageable pageable) throws DataAccessException {
 					new Field[] { VETS.ID }, pageable.pageSize(), pageable.getOffset())
 			.fetch(it -> {
 				ref.totalVets = (Integer) it.get("total_rows");
-				return new Vet(it.get(VETS.ID), it.get(VETS.FIRST_NAME), it.get(VETS.LAST_NAME),
-						new HashSet<>(it.get(MULTISET_SPECIALITIES)));
+				return toVet(it);
 			});
 		return new Page<>(vets, pageable, ref.totalVets);
 	}
 
+	private static Vet toVet(org.jooq.Record row) {
+		return new Vet(row.get(VETS.ID), row.get(VETS.FIRST_NAME), row.get(VETS.LAST_NAME),
+				new HashSet<>(row.get(MULTISET_SPECIALITIES)));
+	}
+
 }