Fixes for bugs 49,50, 51

krraghavan · Jul 26, 2024 · a345b94 · a345b94
1 parent 18c9b10
commit a345b94
Show file tree

Hide file tree

Showing 92 changed files with 865 additions and 1,602 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-[![Java CI with Maven](https://github.com/krraghavan/mongodb-aggregate-query-support/actions/workflows/maven.yml/badge.svg?branch=master)](https://github.com/krraghavan/mongodb-aggregate-query-support/actions/workflows/maven.yml)[![Release Version](https://img.shields.io/badge/version-v0.9.3-red.svg)](https://github.com/krraghavan/mongodb-aggregate-query-support) [![License](https://img.shields.io/hexpm/l/plug.svg)](https://img.shields.io/hexpm/l/plug.svg)
+[![Java CI with Maven](https://github.com/krraghavan/mongodb-aggregate-query-support/actions/workflows/maven.yml/badge.svg?branch=master)](https://github.com/krraghavan/mongodb-aggregate-query-support/actions/workflows/maven.yml)[![Release Version](https://img.shields.io/badge/version-v0.9.4-red.svg)](https://github.com/krraghavan/mongodb-aggregate-query-support) [![License](https://img.shields.io/hexpm/l/plug.svg)](https://img.shields.io/hexpm/l/plug.svg)
 
 # MONGO DB AGGREGATE QUERY SUPPORT
 This module provides annotated support for MongoDB aggregate queries much like the @Query annotation provided by the 
@@ -8,6 +8,11 @@ The @Query annotation provided by Spring Data MongoDb allows queries to be execu
 It is highly desirable to have a similar mechanism for MongoDB aggregate queries which allow us to execute sophisticated
 queries with practically no code being written.
 
+## New in 0.9.4 version
+1. [Bug 50](https://github.com/krraghavan/mongodb-aggregate-query-support/issues/50): Added ```@@``` support for ```@Project``` and ```@Group``` stages
+1. [Bug 51](https://github.com/krraghavan/mongodb-aggregate-query-support/issues/51): Facets with ```@@@``` annotations in ```@Project``` do not parse correctly
+
+
 ## New in 0.9.3 version
 1. [Bug 49](https://github.com/krraghavan/mongodb-aggregate-query-support/issues/49): Fixed Date parsing when msecs are separated by dot (.).
 

diff --git a/mongodb-aggregate-query-support-core/pom.xml b/mongodb-aggregate-query-support-core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>mongodb-aggregate-query-support</artifactId>
     <groupId>com.github.krraghavan</groupId>
-    <version>0.9.4-SNAPSHOT</version>
+    <version>0.9.4</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/...-core/src/main/java/com/github/krr/mongodb/aggregate/support/api/BoundParameterValue.java b/...-core/src/main/java/com/github/krr/mongodb/aggregate/support/api/BoundParameterValue.java
@@ -20,7 +20,6 @@ public interface BoundParameterValue {
   String getValue(Object[] methodParameterValues, String query, BiFunction<Integer, Class<?>, String> valueProviderFn);
 
   default boolean isString(Object[] methodParameterValues, int index) {
-    int length = methodParameterValues.length;
     validateIndex(methodParameterValues, index);
     return (methodParameterValues[index] instanceof String);
   }

diff --git a/...rt-core/src/main/java/com/github/krr/mongodb/aggregate/support/enums/AggregationType.java b/...rt-core/src/main/java/com/github/krr/mongodb/aggregate/support/enums/AggregationType.java
diff --git a/...rc/main/java/com/github/krr/mongodb/aggregate/support/exceptions/MongoQueryException.java b/...rc/main/java/com/github/krr/mongodb/aggregate/support/exceptions/MongoQueryException.java
@@ -22,7 +22,7 @@
  * Created by rkolliva on 10/24/2015.
  * Used for query execution failures
  */
-public class MongoQueryException extends Exception {
+public class MongoQueryException extends RuntimeException {
 
   public MongoQueryException() {
   }

diff --git a/...ore/src/test/java/com/github/krr/mongodb/aggregate/support/enums/AggregationTypeTest.java b/...ore/src/test/java/com/github/krr/mongodb/aggregate/support/enums/AggregationTypeTest.java
@@ -42,7 +42,7 @@ public Object[][] atPhFixtures() {
   }
 
   @Test(dataProvider = "questionMarkFixtures")
-  public void mustParseQuestionMarkPh(String query, AggregationType.QUOTE_TYPE quoteType) {
+  void mustParseQuestionMarkPh(String query, AggregationType.QUOTE_TYPE quoteType) {
     Matcher matcher = AggregationType.PLACEHOLDER_REGEX.matcher(query);
     boolean found = matcher.find();
     assertTrue(found);
@@ -51,7 +51,7 @@ public void mustParseQuestionMarkPh(String query, AggregationType.QUOTE_TYPE quo
   }
 
   @Test(dataProvider = "atPhFixtures")
-  public void mustParseAtPh(String query, boolean valid, AggregationType.QUOTE_TYPE quoteType) {
+  void mustParseAtPh(String query, boolean valid, AggregationType.QUOTE_TYPE quoteType) {
     Matcher matcher = AggregationType.PLACEHOLDER_REGEX.matcher(query);
     boolean found = matcher.find();
     assertTrue(found);

diff --git a/...core/src/test/java/com/github/krr/mongodb/aggregate/support/enums/BoundValueImplTest.java b/...core/src/test/java/com/github/krr/mongodb/aggregate/support/enums/BoundValueImplTest.java
@@ -1,14 +1,27 @@
 package com.github.krr.mongodb.aggregate.support.enums;
 
+import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.RandomUtils;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
+import java.util.function.BiFunction;
+
 import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNull;
 
 public class BoundValueImplTest {
 
+  @DataProvider
+  public static Object[][] invalidNumericOnlyPhFixtures() {
+    Object[] args = {randomAlphabetic(5), RandomStringUtils.randomAlphabetic(10)};
+    return new Object[][]{
+      new Object[]{AggregationType.LIMIT, args},
+      new Object[]{AggregationType.SKIP, args},
+    };
+  }
+
   @DataProvider
   private Object[][] queryFixtures() {
     String randomValues1 = randomAlphabetic(10);
@@ -175,6 +188,24 @@ public void mustProcessValidAtAtParameterForMatch() {
     assertEquals(query, expectedQuery);
   }
 
+  // Resolves: https://github.com/krraghavan/mongodb-aggregate-query-support/issues/51
+  @Test
+  public void mustProcessValidAtAtParameterForProject() {
+    String expectedQuery = "{'" + randomAlphabetic(5) + "':'" + randomAlphabetic(10) + "'}";
+    Object[] args = {randomAlphabetic(5), expectedQuery};
+    String query = AggregationType.PROJECT.getValue(args, "@@1", (index, valueClass) -> (String) args[index]);
+    assertEquals(query, expectedQuery);
+  }
+
+  // Resolves: https://github.com/krraghavan/mongodb-aggregate-query-support/issues/51
+  @Test
+  public void mustProcessValidAtAtParameterForGroup() {
+    String expectedQuery = "{'" + randomAlphabetic(5) + "':'" + randomAlphabetic(10) + "'}";
+    Object[] args = {randomAlphabetic(5), expectedQuery};
+    String query = AggregationType.GROUP.getValue(args, "@@1", (index, valueClass) -> (String) args[index]);
+    assertEquals(query, expectedQuery);
+  }
+
   @Test
   public void mustProcessValidAtAtParameterForEmptyMatch() {
     String expectedQuery = "{   }";
@@ -183,4 +214,34 @@ public void mustProcessValidAtAtParameterForEmptyMatch() {
     assertNull(query);
   }
 
+  @DataProvider
+  public static Object[][] numericOnlyPhFixtures() {
+    int integer = RandomUtils.nextInt();
+    long longValue = RandomUtils.nextLong();
+    String longStr = String.valueOf(longValue);
+    String intStr = String.valueOf(integer);
+    return new Object[][]{
+        new Object[]{AggregationType.LIMIT, new Object[]{longValue}, longStr,
+                     (BiFunction<Integer, Class<?>, String>) (v, c) -> longStr},
+        new Object[]{AggregationType.LIMIT, new Object[]{integer}, intStr,
+                     (BiFunction<Integer, Class<?>, String>) (v, c) -> intStr},
+        new Object[]{AggregationType.SKIP, new Object[]{integer}, longStr,
+                     (BiFunction<Integer, Class<?>, String>) (v, c) -> longStr},
+        new Object[]{AggregationType.SKIP, new Object[]{integer}, intStr,
+                     (BiFunction<Integer, Class<?>, String>) (v, c) -> intStr},
+    };
+  }
+
+
+  @Test(dataProvider = "numericOnlyPhFixtures")
+  public void mustProcessNumericOnlyPhValues(AggregationType aggregationType, Object [] args, String expectedResult,
+                                             BiFunction<Integer, Class<?>, String> cbFn) {
+    String query = AggregationType.getIntOrLongValueForQmarkPh(aggregationType, args, expectedResult, cbFn);
+    assertEquals(query, expectedResult);
+  }
+
+  @Test(dataProvider = "invalidNumericOnlyPhFixtures", expectedExceptions = IllegalArgumentException.class)
+  public void mustNotProcessNonNumericValuesOnNumericOnlyPhValues(AggregationType aggregationType, Object [] args) {
+    String query = aggregationType.getValue(args, "?0", (index, valueClass) -> (String) args[index]);
+  }
 }
diff --git a/mongodb-aggregate-query-support-reactive/pom.xml b/mongodb-aggregate-query-support-reactive/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>com.github.krraghavan</groupId>
     <artifactId>mongodb-aggregate-query-support</artifactId>
-    <version>0.9.4-SNAPSHOT</version>
+    <version>0.9.4</version>
     <relativePath>../../mongodb-aggregate-query-support/pom.xml</relativePath>
   </parent>
 

diff --git a/...main/java/com/github/krr/mongodb/aggregate/support/query/ReactiveAggregateMongoQuery.java b/...main/java/com/github/krr/mongodb/aggregate/support/query/ReactiveAggregateMongoQuery.java
@@ -21,7 +21,6 @@
 import com.github.krr.mongodb.aggregate.support.annotations.Aggregate;
 import com.github.krr.mongodb.aggregate.support.api.ReactiveMongoQueryExecutor;
 import com.github.krr.mongodb.aggregate.support.exceptions.InvalidAggregationQueryException;
-import com.github.krr.mongodb.aggregate.support.exceptions.MongoQueryException;
 import org.reactivestreams.Publisher;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -90,10 +89,6 @@ public Publisher<Object> execute(Object[] parameters) {
                                                                                            parameterAccessor);
       return (Publisher<Object>) queryExecutor.executeQuery(aggregateQueryProvider);
     }
-    catch (MongoQueryException e) {
-      LOGGER.error("Error executing aggregate query", e);
-      throw new IllegalStateException(e);
-    }
     catch (InvalidAggregationQueryException e) {
       LOGGER.error("Invalid aggregation query", e);
       throw new IllegalArgumentException(e);

diff --git a/...ithub/krr/mongodb/aggregate/support/query/ReactiveMongoNativeJavaDriverQueryExecutor.java b/...ithub/krr/mongodb/aggregate/support/query/ReactiveMongoNativeJavaDriverQueryExecutor.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.krr.mongodb.aggregate.support.api.QueryProvider;
+import com.github.krr.mongodb.aggregate.support.exceptions.MongoQueryException;
 import com.mongodb.reactivestreams.client.AggregatePublisher;
 import com.mongodb.reactivestreams.client.MongoCollection;
 import org.apache.commons.lang3.StringUtils;
@@ -76,7 +77,12 @@ public Publisher<?> executeQuery(QueryProvider queryProvider) {
     Mono<AggregatePublisher<Document>> aggregatePublisherMono = collectionMono.map(collection -> collection.aggregate(pipelineStages)
                                                                                  .allowDiskUse(queryProvider.isAllowDiskUse())
                                                                                  .maxTime(queryProvider.getMaxTimeMS(),
-                                                                                          MILLISECONDS));
+                                                                                          MILLISECONDS))
+                                                                              .doOnError(e -> {
+                                                                                LOGGER.error("Error executing query {}",
+                                                                                             pipelineStages, e);
+                                                                                throw new MongoQueryException(e);
+                                                                              });
     Class<?> methodReturnType = queryProvider.getMethodReturnType();
     boolean isFlux = Flux.class.isAssignableFrom(methodReturnType);
     boolean isMono = Mono.class.isAssignableFrom(methodReturnType);
@@ -89,7 +95,11 @@ public Publisher<?> executeQuery(QueryProvider queryProvider) {
 
     if (isFlux) {
       LOGGER.trace("Return type is Flux<{}>", outputClass);
-      Flux<Document> retval = aggregatePublisherMono.flatMapMany(ap -> ap);
+      Flux<Document> retval = aggregatePublisherMono.flatMapMany(ap -> ap)
+                                                    .doOnError(e -> {
+                                                      LOGGER.error("Error executing query {}", pipelineStages, e);
+                                                      throw new MongoQueryException(e);
+                                                    });
       if (outputClass != null) {
         return adaptPipeline(queryProvider, outputClass, retval);
       }

diff --git a/...port-reactive/src/test/java/com/github/krr/mongodb/aggregate/support/beans/DummyBean.java b/...port-reactive/src/test/java/com/github/krr/mongodb/aggregate/support/beans/DummyBean.java
@@ -0,0 +1,4 @@
+package com.github.krr.mongodb.aggregate.support.beans;
+
+public class DummyBean {
+}
diff --git a/...github/krr/mongodb/aggregate/support/config/ReactiveTestMongoRepositoryConfiguration.java b/...github/krr/mongodb/aggregate/support/config/ReactiveTestMongoRepositoryConfiguration.java
@@ -19,7 +19,7 @@
 package com.github.krr.mongodb.aggregate.support.config;
 
 import com.github.krr.mongodb.aggregate.support.factory.ReactiveAggregateQuerySupportingRepositoryFactoryBean;
-import com.github.krr.mongodb.aggregate.support.repository.reactive.ReactiveTestAggregateRepositoryMarker;
+import com.github.krr.mongodb.aggregate.support.repository.ReactiveTestAggregateRepositoryMarker;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.mongodb.repository.config.EnableReactiveMongoRepositories;
 

diff --git a/...ggregateQueryProvider2TestRepository.java → ...ggregateQueryProvider2TestRepository.java b/...ggregateQueryProvider2TestRepository.java → ...ggregateQueryProvider2TestRepository.java
@@ -17,7 +17,7 @@
  *
  */
 
-package com.github.krr.mongodb.aggregate.support.repository.reactive;
+package com.github.krr.mongodb.aggregate.support.repository;
 
 import com.github.krr.mongodb.aggregate.support.annotations.Aggregate;
 import com.github.krr.mongodb.aggregate.support.annotations.Match;

diff --git a/...y/reactive/ReactiveArtworkRepository.java → ...repository/ReactiveArtworkRepository.java b/...y/reactive/ReactiveArtworkRepository.java → ...repository/ReactiveArtworkRepository.java
@@ -17,7 +17,7 @@
  *
  */
 
-package com.github.krr.mongodb.aggregate.support.repository.reactive;
+package com.github.krr.mongodb.aggregate.support.repository;
 
 import com.github.krr.mongodb.aggregate.support.annotations.*;
 import com.github.krr.mongodb.aggregate.support.beans.Artwork;
@@ -56,6 +56,17 @@ public interface ReactiveArtworkRepository extends ReactiveMongoRepository<Artwo
       , order = 0)
   Mono<Document> getFacetResults2();
 
+  // fixture created for bug: https://github.com/krraghavan/mongodb-aggregate-query-support/issues/50
+  @Aggregate(inputType = Artwork.class)
+  @Facet(pipelines = {
+      @FacetPipeline(name = "categorizedByTags",
+          stages = {
+              @FacetPipelineStage(stageType = Skip.class, query = "?0"),
+              @FacetPipelineStage(stageType = Limit.class, query = "?1"),
+              @FacetPipelineStage(stageType = Project.class, query = "@@2")
+          })}, order = 0)
+  Mono<Document> facetPipelineStageWithAtAtPh(Long arg1, Long arg2, String arg3);
+
   @Aggregate(inputType = Artwork.class)
   @Facet(pipelines = {
       @FacetPipeline(name = "categorizedByTags",

diff --git a/...llectionNameAnnotationTestRepository.java → ...llectionNameAnnotationTestRepository.java b/...llectionNameAnnotationTestRepository.java → ...llectionNameAnnotationTestRepository.java
@@ -17,7 +17,7 @@
  *
  */
 
-package com.github.krr.mongodb.aggregate.support.repository.reactive;
+package com.github.krr.mongodb.aggregate.support.repository;
 
 import com.github.krr.mongodb.aggregate.support.annotations.*;
 import com.github.krr.mongodb.aggregate.support.beans.Artwork;