diff --git a/.env.template b/.env.template
index 0e768adcd..73ff2d89e 100644
--- a/.env.template
+++ b/.env.template
@@ -79,3 +79,5 @@ TRIAL_START_DELAY=15s
TRAIT_START_DELAY=20s
OBSERVATION_START_DELAY=25s
OBSERVATION_UNIT_START_DELAY=30s
+
+DATA_TABLE_MAX_SIZE=200
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 3afa66cab..1a24e322f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,7 @@
31.0.1-jre
4.9.3
4.3.1
- 2.2-SNAPSHOT
+ 2.2.2-SNAPSHOT
2.11.0
2.2.1
diff --git a/src/main/java/org/breedinginsight/api/v1/controller/ExperimentController.java b/src/main/java/org/breedinginsight/api/v1/controller/ExperimentController.java
index 988402889..878a9441d 100644
--- a/src/main/java/org/breedinginsight/api/v1/controller/ExperimentController.java
+++ b/src/main/java/org/breedinginsight/api/v1/controller/ExperimentController.java
@@ -46,7 +46,6 @@
@Secured(SecurityRule.IS_AUTHENTICATED)
public class ExperimentController {
private final BrAPITrialService experimentService;
- private final ExperimentQueryMapper experimentQueryMapper;
private final ProgramService programService;
private final ExperimentalCollaboratorService experimentalCollaboratorService;
private final SecurityService securityService;
@@ -54,9 +53,8 @@ public class ExperimentController {
private final RoleService roleService;
@Inject
- public ExperimentController(BrAPITrialService experimentService, ExperimentQueryMapper experimentQueryMapper, ProgramService programService, ExperimentalCollaboratorService experimentalCollaboratorService, SecurityService securityService, ProgramUserService programUserService, RoleService roleService) {
+ public ExperimentController(BrAPITrialService experimentService, ProgramService programService, ExperimentalCollaboratorService experimentalCollaboratorService, SecurityService securityService, ProgramUserService programUserService, RoleService roleService) {
this.experimentService = experimentService;
- this.experimentQueryMapper = experimentQueryMapper;
this.programService = programService;
this.experimentalCollaboratorService = experimentalCollaboratorService;
this.securityService = securityService;
diff --git a/src/main/java/org/breedinginsight/brapi/v1/model/request/query/BrapiQuery.java b/src/main/java/org/breedinginsight/brapi/v1/model/request/query/BrapiQuery.java
index f51bcf317..1b4f9234e 100644
--- a/src/main/java/org/breedinginsight/brapi/v1/model/request/query/BrapiQuery.java
+++ b/src/main/java/org/breedinginsight/brapi/v1/model/request/query/BrapiQuery.java
@@ -26,6 +26,7 @@
import javax.validation.constraints.Positive;
import javax.validation.constraints.PositiveOrZero;
+import java.util.Map;
@Getter
@Setter
@@ -42,7 +43,7 @@ public class BrapiQuery implements PaginationParams {
private Integer page;
private String sortField;
- private SortOrder sortOrder;
+ private SortOrder sortOrder = SortOrder.ASC;
public Integer getDefaultPage() {
return DEFAULT_PAGE;
@@ -58,4 +59,26 @@ protected FilterRequest constructFilterRequest(String field, String value) {
.value(value)
.build();
}
+
+ /**
+ * For BrapiQuery objects that have implemented this method, this map is used by the BrAPIDAOUtil
+ * to iterate through all valid filter columns and their associated values that are submitted from the fe.
+ *
+ * See @ExperimentQuery for example implementation
+ */
+ public Map getFilterValuesByBrAPIColumnName() {
+ throw new UnsupportedOperationException(
+ String.format("Server side BrAPI filtering not implemented for class [%s]", this.getClass().getSimpleName())
+ );
+ }
+
+ /**
+ * For BrapiQuery objects that have implemented this method, this map is used by the BrAPIDAOUtil
+ * to match submitted sortField column names to the associated brapi column name for sorting.
+ *
+ * See @ExperimentQuery for example implementation
+ */
+ public Map getBrAPIColumnNamesByBiColumnName() {
+ throw new UnsupportedOperationException(String.format("Server side BrAPI sorting not implemented for class [%s]", this.getClass().getSimpleName()));
+ }
}
diff --git a/src/main/java/org/breedinginsight/brapi/v2/BrAPIGermplasmController.java b/src/main/java/org/breedinginsight/brapi/v2/BrAPIGermplasmController.java
index 7bcf71de6..319a1e7de 100644
--- a/src/main/java/org/breedinginsight/brapi/v2/BrAPIGermplasmController.java
+++ b/src/main/java/org/breedinginsight/brapi/v2/BrAPIGermplasmController.java
@@ -1,6 +1,5 @@
package org.breedinginsight.brapi.v2;
-import com.drew.lang.annotations.Nullable;
import io.micronaut.context.annotation.Property;
import io.micronaut.http.HttpHeaders;
import io.micronaut.http.HttpResponse;
@@ -27,7 +26,6 @@
import org.brapi.v2.model.germ.response.BrAPIGermplasmProgenyResponse;
import org.breedinginsight.api.auth.ProgramSecured;
import org.breedinginsight.api.auth.ProgramSecuredRoleGroup;
-import org.breedinginsight.api.model.v1.request.query.SearchRequest;
import org.breedinginsight.api.model.v1.response.DataResponse;
import org.breedinginsight.api.model.v1.response.Response;
import org.breedinginsight.api.model.v1.validators.QueryValid;
@@ -108,17 +106,8 @@ public HttpResponse