Merge pull request #23994 from OpenLiberty/revert-23919-22673-filter-with-or

Revert "filter with OR"

Author: tevans78

dev/io.openliberty.data.internal.persistence/src/io/openliberty/data/internal/persistence/RepositoryImpl.java

@@ -1138,7 +1138,7 @@ private StringBuilder generateWhereClause(QueryInfo queryInfo, Filter[] filters)
             if (first)
                 first = false;
             else
-                q.append(' ').append(filter.as().name()).append(' '); // AND / OR between conditions
+                q.append(" AND ");
 
             String attribute = filter.by();
             boolean ignoreCase = filter.ignoreCase();

dev/io.openliberty.data.internal_fat/test-applications/DataTestApp/src/test/jakarta/data/web/DataTestServlet.java

@@ -2365,7 +2365,7 @@ public void testPartialQueryAnnotations() {
 
         Shipment s5 = new Shipment();
         s5.destination = "201 4th St SE, Rochester, MN 55904";
-        s5.location = "2800 37th St NW, Rochester, MN 55901";
+        s5.location = " 2800 37th St NW, Rochester, MN 55901";
         s5.id = 5;
         s5.orderedAt = OffsetDateTime.now().minusSeconds(50);
         s5.status = "PREPARING";
@@ -2399,23 +2399,15 @@ public void testPartialQueryAnnotations() {
         assertEquals(true, shipments.cancel(5, OffsetDateTime.now()));
         assertEquals(false, shipments.cancel(10, OffsetDateTime.now()));
 
+        shipments.trim();
+        s = shipments.find(4);
+        assertEquals("2800 37th St NW, Rochester, MN 55901", s.location);
+
         assertEquals(2, shipments.removeCanceled());
 
         assertEquals(3, shipments.removeEverything());
     }
 
-    /**
-     * Use a repository method that has both AND and OR keywords.
-     * The AND keywords should take precedence over OR and be computed first.
-     */
-    @Test
-    public void testPrecedenceOfAndOverOr() {
-        assertIterableEquals(List.of(41L, 37L, 31L, 11L, 7L),
-                             primes.lessThanWithSuffixOrBetweenWithSuffix(40L, "even", 30L, 50L, "one")
-                                             .map(p -> p.number)
-                                             .collect(Collectors.toList()));
-    }
-
     /**
      * Use the provided methods of a Repository<T, K> interface that is a copy of Jakarta NoSQL's.
      */
@@ -3633,106 +3625,6 @@ public void testTotalCountsWithKeysetPagination() {
         assertEquals(null, page4.nextPageable());
     }
 
-    /**
-     * Update multiple entries.
-     */
-    @Test
-    public void testUpdateAnnotation() {
-        products.clear();
-
-        Product prod1 = new Product();
-        prod1.id = "UPD-ANNO-1";
-        prod1.name = "Fairly Priced TestUpdateAnnotation Item";
-        prod1.price = 5.00f;
-        products.save(prod1);
-
-        Product prod2 = new Product();
-        prod2.id = "UPD-ANNO-2";
-        prod2.name = "Highly Priced TestUpdateAnnotation Item";
-        prod2.price = 100.00f;
-        products.save(prod2);
-
-        Product prod3 = new Product();
-        prod3.id = "UPD-ANNO-3";
-        prod3.name = "Middle Priced TestUpdateAnnotation Item";
-        prod3.price = 40.00f;
-        products.save(prod3);
-
-        Product prod4 = new Product();
-        prod4.id = "UPD-ANNO-4";
-        prod4.name = "Inexpensive TestUpdateAnnotation Item";
-        prod4.price = 2.00f;
-        products.save(prod4);
-
-        Product prod5 = new Product();
-        prod5.id = "UPD-ANNO-5";
-        prod5.name = "Ridiculously High Priced TestUpdateAnnotation Item";
-        prod5.price = 500.00f;
-        products.save(prod5);
-
-        Product prod6 = new Product();
-        prod6.id = "UPD-ANNO-6";
-        prod6.name = "Lowest Priced TestUpdateAnnotation Item";
-        prod6.price = 1.00f;
-        products.save(prod6);
-
-        assertEquals(true, products.isNotEmpty());
-        assertEquals(6, products.total());
-
-        assertEquals(5, products.inflatePrices("Priced TestUpdateAnnotation Item", 1.07f)); // prod4 does not match
-
-        Product[] found = products.findByVersionGreaterThanEqualOrderByPrice(2);
-
-        assertEquals(Stream.of(found).map(p -> p.id).collect(Collectors.toList()).toString(),
-                     5, found.length);
-
-        assertEquals(1.07f, found[0].price, 0.001f);
-        assertEquals(5.35f, found[1].price, 0.001f);
-        assertEquals(42.80f, found[2].price, 0.001f);
-        assertEquals(107.00f, found[3].price, 0.001f);
-        assertEquals(535.00f, found[4].price, 0.001f);
-
-        Product item = products.findItem("UPD-ANNO-4");
-        assertEquals(2.00f, item.price, 0.001f);
-
-        products.undoPriceIncrease(Set.of("UPD-ANNO-5", "UPD-ANNO-2", "UPD-ANNO-1"), 1.07f);
-
-        found = products.findByVersionGreaterThanEqualOrderByPrice(1);
-
-        assertEquals(Stream.of(found).map(p -> p.id).collect(Collectors.toList()).toString(),
-                     6, found.length);
-
-        assertEquals(1.07f, found[0].price, 0.001f); // update remains in place
-        assertEquals(2.00f, found[1].price, 0.001f); // never updated
-        assertEquals(5.00f, found[2].price, 0.001f); // reverted
-        assertEquals(42.80f, found[3].price, 0.001f); // update remains in place
-        assertEquals(100.00f, found[4].price, 0.001f); // reverted
-        assertEquals(500.00f, found[5].price, 0.001f); // reverted
-
-        assertEquals(2, found[0].version); // update remains in place
-        assertEquals(1, found[1].version); // never updated
-        assertEquals(1, found[2].version); // reverted
-        assertEquals(2, found[3].version); // update remains in place
-        assertEquals(1, found[4].version); // reverted
-        assertEquals(1, found[5].version); // reverted
-
-        assertEquals(6, products.inflateAllPrices(1.05f));
-
-        found = products.findByVersionGreaterThanEqualOrderByPrice(2);
-
-        assertEquals(1.12f, found[0].price, 0.01f);
-        assertEquals(2.10f, found[1].price, 0.01f);
-        assertEquals(5.25f, found[2].price, 0.01f);
-        assertEquals(44.94f, found[3].price, 0.01f);
-        assertEquals(105.00f, found[4].price, 0.01f);
-        assertEquals(525.00f, found[5].price, 0.01f);
-
-        products.clear();
-
-        assertEquals(0, products.total());
-        assertEquals(false, products.isNotEmpty());
-    }
-
     /**
      * Update multiple entries.
      */

dev/io.openliberty.data.internal_fat/test-applications/DataTestApp/src/test/jakarta/data/web/Packages.java

@@ -14,8 +14,6 @@
 
 import java.util.List;
 
-import jakarta.data.repository.Condition;
-import jakarta.data.repository.Filter;
 import jakarta.data.repository.KeysetAwarePage;
 import jakarta.data.repository.KeysetAwareSlice;
 import jakarta.data.repository.OrderBy;
@@ -46,8 +44,7 @@ public interface Packages extends PageableRepository<Package, Integer> {
     long updateByLengthLessThanEqualAndHeightBetweenMultiplyLengthMultiplyWidthSetHeight(float maxLength, float minHeight, float maxHeight,
                                                                                          float lengthMultiplier, float widthMultiplier, float newHeight);
 
-    @Filter(by = "height", op = Condition.LessThan, param = "min")
-    @Filter(as = Filter.Type.OR, by = "height", op = Condition.GreaterThan, param = "max")
+    @Query("SELECT o from Package o WHERE (o.height < :min OR o.height > :max)") // TODO @Filter with Or
     KeysetAwarePage<Package> whereHeightNotWithin(@Param("min") float minToExclude,
                                                   @Param("max") float maxToExclude,
                                                   Pageable pagination);

dev/io.openliberty.data.internal_fat/test-applications/DataTestApp/src/test/jakarta/data/web/Primes.java

@@ -46,6 +46,7 @@
  */
 @Repository
 public interface Primes {
+
     @Exists
     @Filter(by = "binary", op = Compare.EndsWith, param = "bits")
     @Filter(by = "number", op = Compare.LessThan, param = "max")
@@ -180,14 +181,6 @@ public interface Primes {
     @Select("number")
     List<Long> inRangeHavingVNumeralAndSubstringOfName(long min, long max, String nameSuffix);
 
-    @Filter(by = "number", op = Condition.LessThan)
-    @Filter(by = "name", op = Condition.EndsWith)
-    @Filter(as = Filter.Type.OR, by = "number", op = Condition.Between)
-    @Filter(by = "name", op = Condition.EndsWith)
-    @OrderBy(value = "number", descending = true)
-    Stream<Prime> lessThanWithSuffixOrBetweenWithSuffix(long numLessThan, String firstSuffix,
-                                                        long lowerLimit, long upperLimit, String secondSuffix);
-
     @Query("SELECT MIN(o.number), MAX(o.number), SUM(o.number), COUNT(o.number), AVG(o.number) FROM Prime o WHERE o.number < ?1")
     Deque<Double> minMaxSumCountAverageDeque(long numBelow);
 

dev/io.openliberty.data.internal_fat/test-applications/DataTestApp/src/test/jakarta/data/web/ProductRepo.java

@@ -15,12 +15,7 @@
 import java.util.List;
 import java.util.Set;
 
-import jakarta.data.repository.Condition;
-import jakarta.data.repository.Count;
-import jakarta.data.repository.Delete;
-import jakarta.data.repository.Exists;
 import jakarta.data.repository.Filter;
-import jakarta.data.repository.Operation;
 import jakarta.data.repository.OrderBy;
 import jakarta.data.repository.Param;
 import jakarta.data.repository.Query;
@@ -34,9 +29,6 @@
  */
 @Repository
 public interface ProductRepo {
-    @Delete
-    void clear();
-
     @Query("DELETE FROM Product o WHERE o.id IN ?1")
     int discontinueProducts(Set<String> ids);
 
@@ -52,18 +44,6 @@ public interface ProductRepo {
     @Select(function = Aggregate.MAXIMUM, value = "price")
     float highestPrice();
 
-    @Update(attr = "price", op = Operation.Multiply)
-    @Update(attr = "version", op = Operation.Add, value = "1")
-    long inflateAllPrices(float rateOfIncrease);
-
-    @Filter(by = "name", op = Condition.Contains)
-    @Update(attr = "price", op = Operation.Multiply)
-    @Update(attr = "version", op = Operation.Add, value = "1")
-    long inflatePrices(String nameContains, float rateOfIncrease);
-
-    @Exists
-    boolean isNotEmpty();
-
     @Select(function = Aggregate.MINIMUM, value = "price")
     float lowestPrice();
 
@@ -83,14 +63,6 @@ public interface ProductRepo {
     @Select(function = Aggregate.COUNT, distinct = false, value = { "name", "description", "price" })
     ProductCount stats();
 
-    @Count
-    int total();
-
     @Select(function = Aggregate.SUM, distinct = true, value = "price")
     float totalOfDistinctPrices();
-
-    @Filter(by = "id", op = Condition.In)
-    @Update(attr = "price", op = Operation.Divide)
-    @Update(attr = "version", op = Operation.Subtract, value = "1")
-    long undoPriceIncrease(Iterable<String> productIds, float divisor);
 }

dev/io.openliberty.data.internal_fat/test-applications/DataTestApp/src/test/jakarta/data/web/Shipments.java

@@ -20,6 +20,7 @@
 import jakarta.data.repository.Filter;
 import jakarta.data.repository.OrderBy;
 import jakarta.data.repository.Param;
+import jakarta.data.repository.Query;
 import jakarta.data.repository.Repository;
 import jakarta.data.repository.Select;
 import jakarta.data.repository.Update;
@@ -67,6 +68,10 @@ boolean cancel(@Param("shipmentId") long id,
 
     void save(Shipment s);
 
+    // TODO @Update on its own instead of this
+    @Query("UPDATE Shipment o SET o.location = TRIM(o.location)")
+    void trim();
+
     @Filter(by = "id")
     @Filter(by = "location")
     @Update(attr = "location")

dev/io.openliberty.jakarta.data.1.0/src/jakarta/data/repository/Filter.java

@@ -22,8 +22,6 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
 public @interface Filter {
-    Type as() default Type.AND;
-
     String by();
 
     boolean ignoreCase() default false;
@@ -45,9 +43,4 @@
     public @interface List {
         Filter[] value();
     }
-
-    public enum Type {
-        AND,
-        OR
-    }
 }