Skip to content

Add with() method and rename fetch() methods to fetchOf(). #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 24, 2024
Merged

Add with() method and rename fetch() methods to fetchOf(). #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions ...n/java/io/github/quinnandrews/spring/data/specification/builder/SpecificationBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@ public SpecificationBuilder<T> or(final Specification<T> specification) {
return this;
}

public SpecificationBuilder<T> with() {
return this;
}

@Deprecated
public SpecificationBuilder<T> andWhere(final Specification<T> specification) {
return where(specification);
Expand Down Expand Up @@ -167,12 +171,12 @@ public SpecificationBuilder<T> whereIn(final SingularAttribute<T, ?> attribute,

@Deprecated
public SpecificationBuilder<T> withFetch(final SingularAttribute<T, ?> attribute) {
return and(SpecificationFactory.fetch(attribute));
return and(SpecificationFactory.fetchOf(attribute));
}

@Deprecated
public SpecificationBuilder<T> withFetch(final PluralAttribute<T, ?, ?> attribute) {
return and(SpecificationFactory.fetch(attribute));
return and(SpecificationFactory.fetchOf(attribute));
}

public SpecificationBuilder<T> isEqualTo(final SingularAttribute<T, ?> attribute,
Expand Down Expand Up @@ -252,11 +256,11 @@ public SpecificationBuilder<T> isIn(final SingularAttribute<T, ?> attribute,
return where(SpecificationFactory.isIn(attribute, values));
}

public SpecificationBuilder<T> fetch(final SingularAttribute<T, ?> attribute) {
return and(SpecificationFactory.fetch(attribute));
public SpecificationBuilder<T> fetchOf(final SingularAttribute<T, ?> attribute) {
return and(SpecificationFactory.fetchOf(attribute));
}

public SpecificationBuilder<T> fetch(final PluralAttribute<T, ?, ?> attribute) {
return and(SpecificationFactory.fetch(attribute));
public SpecificationBuilder<T> fetchOf(final PluralAttribute<T, ?, ?> attribute) {
return and(SpecificationFactory.fetchOf(attribute));
}
}
4 changes: 2 additions & 2 deletions ...n/java/io/github/quinnandrews/spring/data/specification/builder/SpecificationFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ public static <T> Specification<T> isIn(final SingularAttribute<T, ?> attribute,
.collect(Collectors.toSet()));
}

public static <T> Specification<T> fetch(final SingularAttribute<T, ?> attribute) {
public static <T> Specification<T> fetchOf(final SingularAttribute<T, ?> attribute) {
Objects.requireNonNull(attribute, ATTRIBUTE_CANNOT_BE_NULL);
if (noneAreNull(attribute)) {
return (root, query, builder) -> {
Expand All @@ -169,7 +169,7 @@ public static <T> Specification<T> fetch(final SingularAttribute<T, ?> attribute
return ghost();
}

public static <T> Specification<T> fetch(final PluralAttribute<T, ?, ?> attribute) {
public static <T> Specification<T> fetchOf(final PluralAttribute<T, ?, ?> attribute) {
Objects.requireNonNull(attribute, ATTRIBUTE_CANNOT_BE_NULL);
if (noneAreNull(attribute)) {
return (root, query, builder) -> {
Expand Down
32 changes: 16 additions & 16 deletions ...b/quinnandrews/spring/data/specification/builder/SpecificationBuilderIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ void or_withSpecification() {
void isEqualTo() {
var optionalPedal = guitarPedalRepository.findOne(
SpecificationBuilder.from(GuitarPedal.class)
.isEqualTo(GuitarPedal_.id, 3L)
.where().isEqualTo(GuitarPedal_.id, 3L)
.toSpecification());
assertTrue(optionalPedal.isPresent());
assertEquals(3L, optionalPedal.get().getId());
Expand All @@ -328,7 +328,7 @@ void isEqualTo() {
void isNotEqualTo() {
var pedals = guitarPedalRepository.findAll(
SpecificationBuilder.from(GuitarPedal.class)
.isNotEqualTo(GuitarPedal_.id, 3L)
.where().isNotEqualTo(GuitarPedal_.id, 3L)
.toSpecification());
assertEquals(3, pedals.size());
assertTrue(pedals.stream()
Expand All @@ -341,7 +341,7 @@ void isNotEqualTo() {
void isLike() {
var pedals = guitarPedalRepository.findAll(
SpecificationBuilder.from(GuitarPedal.class)
.isLike(GuitarPedal_.name, "%and%")
.where().isLike(GuitarPedal_.name, "%and%")
.toSpecification(), Sort.by("name"));
assertEquals(2, pedals.size());
assertEquals("Deco: Tape Saturation and Double Tracker", pedals.get(0).getName());
Expand All @@ -352,7 +352,7 @@ void isLike() {
void isNotLike() {
var pedals = guitarPedalRepository.findAll(
SpecificationBuilder.from(GuitarPedal.class)
.isNotLike(GuitarPedal_.name, "%and%")
.where().isNotLike(GuitarPedal_.name, "%and%")
.toSpecification(), Sort.by("name"));
assertEquals(2, pedals.size());
assertEquals("Big Muff Fuzz", pedals.get(0).getName());
Expand All @@ -362,7 +362,7 @@ void isNotLike() {
@Test
void isEqualToOrLike() {
var pedals = guitarPedalRepository.findAll(SpecificationBuilder.from(GuitarPedal.class)
.isEqualToOrLike(GuitarPedal_.name, "Deco%")
.where().isEqualToOrLike(GuitarPedal_.name, "Deco%")
.toSpecification(), Sort.by("name"));
assertEquals(1, pedals.size());
assertEquals("Deco: Tape Saturation and Double Tracker", pedals.get(0).getName());
Expand All @@ -372,7 +372,7 @@ void isEqualToOrLike() {
void isNull() {
var pedals = guitarPedalRepository.findAll(
SpecificationBuilder.from(GuitarPedal.class)
.isNull(GuitarPedal_.dateSold)
.where().isNull(GuitarPedal_.dateSold)
.toSpecification(), Sort.by("name"));
assertEquals(3, pedals.size());
assertEquals("Big Muff Fuzz", pedals.get(0).getName());
Expand All @@ -387,7 +387,7 @@ void isNull() {
void isNotNull() {
var pedals = guitarPedalRepository.findAll(
SpecificationBuilder.from(GuitarPedal.class)
.isNotNull(GuitarPedal_.dateSold)
.where().isNotNull(GuitarPedal_.dateSold)
.toSpecification(), Sort.by("name"));
assertEquals(1, pedals.size());
assertEquals("Sneak Attack: Attack/Decay and Tremolo", pedals.get(0).getName());
Expand All @@ -398,7 +398,7 @@ void isNotNull() {
void isTrue() {
var pedals = guitarPedalRepository.findAll(
SpecificationBuilder.from(GuitarPedal.class)
.isTrue(GuitarPedal_.hasStereoOutput)
.where().isTrue(GuitarPedal_.hasStereoOutput)
.toSpecification(), Sort.by("name"));
assertEquals(1, pedals.size());
assertEquals("Deco: Tape Saturation and Double Tracker", pedals.get(0).getName());
Expand All @@ -410,7 +410,7 @@ void isTrue() {
void isFalse() {
var pedals = guitarPedalRepository.findAll(
SpecificationBuilder.from(GuitarPedal.class)
.isFalse(GuitarPedal_.hasStereoOutput)
.where().isFalse(GuitarPedal_.hasStereoOutput)
.toSpecification(), Sort.by("name"));
assertEquals(3, pedals.size());
assertEquals("Big Muff Fuzz", pedals.get(0).getName());
Expand All @@ -425,7 +425,7 @@ void isFalse() {
void isGreaterThan() {
var pedals = guitarPedalRepository.findAll(
SpecificationBuilder.from(GuitarPedal.class)
.isGreaterThan(GuitarPedal_.usedValue, 200)
.where().isGreaterThan(GuitarPedal_.usedValue, 200)
.toSpecification(), Sort.by("name"));
assertEquals(1, pedals.size());
assertEquals("Deco: Tape Saturation and Double Tracker", pedals.get(0).getName());
Expand All @@ -436,7 +436,7 @@ void isGreaterThan() {
void isGreaterThanOrEqualTo() {
var pedals = guitarPedalRepository.findAll(
SpecificationBuilder.from(GuitarPedal.class)
.isGreaterThanOrEqualTo(GuitarPedal_.usedValue, 200)
.where().isGreaterThanOrEqualTo(GuitarPedal_.usedValue, 200)
.toSpecification(), Sort.by("name"));
assertEquals(2, pedals.size());
assertEquals("Deco: Tape Saturation and Double Tracker", pedals.get(0).getName());
Expand All @@ -449,7 +449,7 @@ void isGreaterThanOrEqualTo() {
void isLessThan() {
var pedals = guitarPedalRepository.findAll(
SpecificationBuilder.from(GuitarPedal.class)
.isLessThan(GuitarPedal_.usedValue, 150)
.where().isLessThan(GuitarPedal_.usedValue, 150)
.toSpecification(), Sort.by("name"));
assertEquals(1, pedals.size());
assertEquals("Big Muff Fuzz", pedals.get(0).getName());
Expand All @@ -460,7 +460,7 @@ void isLessThan() {
void isLessThanOrEqualTo() {
var pedals = guitarPedalRepository.findAll(
SpecificationBuilder.from(GuitarPedal.class)
.isLessThanOrEqualTo(GuitarPedal_.usedValue, 150)
.where().isLessThanOrEqualTo(GuitarPedal_.usedValue, 150)
.toSpecification(), Sort.by("name"));
assertEquals(2, pedals.size());
assertEquals("Big Muff Fuzz", pedals.get(0).getName());
Expand All @@ -473,7 +473,7 @@ void isLessThanOrEqualTo() {
void isBetween() {
var pedals = guitarPedalRepository.findAll(
SpecificationBuilder.from(GuitarPedal.class)
.isBetween(
.where().isBetween(
GuitarPedal_.datePurchased,
LocalDate.of(2021, 7, 19),
LocalDate.of(2022, 9, 11))
Expand All @@ -489,7 +489,7 @@ void isBetween() {
void isIn_collection() {
var pedals = guitarPedalRepository.findAll(
SpecificationBuilder.from(GuitarPedal.class)
.isIn(GuitarPedal_.id, List.of(2L, 3L))
.where().isIn(GuitarPedal_.id, List.of(2L, 3L))
.toSpecification(), Sort.by("name"));
assertEquals(2, pedals.size());
assertEquals(2L, pedals.get(0).getId());
Expand All @@ -502,7 +502,7 @@ void isIn_collection() {
void isIn_array() {
var pedals = guitarPedalRepository.findAll(
SpecificationBuilder.from(GuitarPedal.class)
.isIn(GuitarPedal_.id, 2L, 3L)
.where().isIn(GuitarPedal_.id, 2L, 3L)
.toSpecification(), Sort.by("name"));
assertEquals(2, pedals.size());
assertEquals(2L, pedals.get(0).getId());
Expand Down
Loading