feat(engine): introduce case-insensitive variable queries

* ProcessInstanceQuery * CaseExecutionQuery * CaseInstanceQuery * ExecutionQuery * HistoricCaseInstanceQuery * HistoricProcessInstanceQuery * VariableInstanceQuery Related to CAM-10647, CAM-10395, Closes #416
camunda · Jul 26, 2019 · 6229264 · 6229264
1 parent de6bd01
commit 6229264
Show file tree

Hide file tree

Showing 38 changed files with 4,345 additions and 222 deletions.
diff --git a/...t/src/main/java/org/camunda/bpm/engine/rest/dto/history/HistoricCaseInstanceQueryDto.java b/...t/src/main/java/org/camunda/bpm/engine/rest/dto/history/HistoricCaseInstanceQueryDto.java
@@ -94,6 +94,9 @@ public class HistoricCaseInstanceQueryDto extends AbstractQueryDto<HistoricCaseI
 
   protected List<VariableQueryParameterDto> variables;
 
+  protected Boolean variableValuesIgnoreCase;
+  protected Boolean variableNamesIgnoreCase;
+
   public HistoricCaseInstanceQueryDto() {}
 
   public HistoricCaseInstanceQueryDto(ObjectMapper objectMapper, MultivaluedMap<String, String> queryParameters) {
@@ -230,6 +233,16 @@ public void setVariables(List<VariableQueryParameterDto> variables) {
     this.variables = variables;
   }
 
+  @CamundaQueryParam(value = "variableValuesIgnoreCase", converter = BooleanConverter.class)
+  public void setVariableValuesIgnoreCase(Boolean variableValuesIgnoreCase) {
+    this.variableValuesIgnoreCase = variableValuesIgnoreCase;
+  }
+
+  @CamundaQueryParam(value = "variableNamesIgnoreCase", converter = BooleanConverter.class)
+  public void setVariableNamesIgnoreCase(Boolean variableNamesIgnoreCase) {
+    this.variableNamesIgnoreCase = variableNamesIgnoreCase;
+  }
+
   @CamundaQueryParam(value = "caseActivityIdIn", converter = StringListConverter.class)
   public void setCaseActivityIdIn(List<String> caseActivityIdIn) {
     this.caseActivityIdIn = caseActivityIdIn;
@@ -326,6 +339,12 @@ protected void applyFilters(HistoricCaseInstanceQuery query) {
     if (caseActivityIdIn != null && !caseActivityIdIn.isEmpty()) {
       query.caseActivityIdIn(caseActivityIdIn.toArray(new String[caseActivityIdIn.size()]));
     }
+    if(Boolean.TRUE.equals(variableNamesIgnoreCase)) {
+      query.matchVariableNamesIgnoreCase();
+    }
+    if(Boolean.TRUE.equals(variableValuesIgnoreCase)) {
+      query.matchVariableValuesIgnoreCase();
+    }
     if (variables != null) {
       for (VariableQueryParameterDto variableQueryParam : variables) {
         String variableName = variableQueryParam.getName();

diff --git a/...rc/main/java/org/camunda/bpm/engine/rest/dto/history/HistoricProcessInstanceQueryDto.java b/...rc/main/java/org/camunda/bpm/engine/rest/dto/history/HistoricProcessInstanceQueryDto.java
@@ -116,6 +116,9 @@ public class HistoricProcessInstanceQueryDto extends AbstractQueryDto<HistoricPr
 
   private List<VariableQueryParameterDto> variables;
 
+  protected Boolean variableNamesIgnoreCase;
+  protected Boolean variableValuesIgnoreCase;
+
   private List<HistoricProcessInstanceQueryDto> orQueries;
 
   public HistoricProcessInstanceQueryDto() {}
@@ -278,6 +281,16 @@ public void setVariables(List<VariableQueryParameterDto> variables) {
     this.variables = variables;
   }
 
+  @CamundaQueryParam(value = "variableNamesIgnoreCase", converter = BooleanConverter.class)
+  public void setVariableNamesIgnoreCase(Boolean variableNamesIgnoreCase) {
+    this.variableNamesIgnoreCase = variableNamesIgnoreCase;
+  }
+
+  @CamundaQueryParam(value = "variableValuesIgnoreCase", converter = BooleanConverter.class)
+  public void setVariableValuesIgnoreCase(Boolean variableValuesIgnoreCase) {
+    this.variableValuesIgnoreCase = variableValuesIgnoreCase;
+  }
+
   public String getIncidentType() {
     return incidentType;
   }
@@ -469,7 +482,12 @@ protected void applyFilters(HistoricProcessInstanceQuery query) {
     if (TRUE.equals(withoutTenantId)) {
       query.withoutTenantId();
     }
-
+    if(TRUE.equals(variableNamesIgnoreCase)) {
+      query.matchVariableNamesIgnoreCase();
+    }
+    if(TRUE.equals(variableValuesIgnoreCase)) {
+      query.matchVariableValuesIgnoreCase();
+    }
     if (variables != null) {
       for (VariableQueryParameterDto variableQueryParam : variables) {
         String variableName = variableQueryParam.getName();

diff --git a/...ine-rest/src/main/java/org/camunda/bpm/engine/rest/dto/runtime/CaseExecutionQueryDto.java b/...ine-rest/src/main/java/org/camunda/bpm/engine/rest/dto/runtime/CaseExecutionQueryDto.java
@@ -70,6 +70,9 @@ public class CaseExecutionQueryDto extends AbstractQueryDto<CaseExecutionQuery>
   protected List<VariableQueryParameterDto> variables;
   protected List<VariableQueryParameterDto> caseInstanceVariables;
 
+  protected Boolean variableNamesIgnoreCase;
+  protected Boolean variableValuesIgnoreCase;
+
   public CaseExecutionQueryDto() {
   }
 
@@ -137,6 +140,16 @@ public void setVariables(List<VariableQueryParameterDto> variables) {
     this.variables = variables;
   }
 
+  @CamundaQueryParam(value = "variableNamesIgnoreCase", converter = BooleanConverter.class)
+  public void setVariableNamesIgnoreCase(Boolean variableNamesIgnoreCase) {
+    this.variableNamesIgnoreCase = variableNamesIgnoreCase;
+  }
+
+  @CamundaQueryParam(value = "variableValuesIgnoreCase", converter = BooleanConverter.class)
+  public void setVariableValuesIgnoreCase(Boolean variableValuesIgnoreCase) {
+    this.variableValuesIgnoreCase = variableValuesIgnoreCase;
+  }
+
   @CamundaQueryParam(value = "caseInstanceVariables", converter = VariableListConverter.class)
   public void setCaseInstanceVariables(List<VariableQueryParameterDto> caseInstanceVariables) {
     this.caseInstanceVariables = caseInstanceVariables;
@@ -198,6 +211,14 @@ protected void applyFilters(CaseExecutionQuery query) {
       query.disabled();
     }
 
+    if(Boolean.TRUE.equals(variableNamesIgnoreCase)) {
+      query.matchVariableNamesIgnoreCase();
+    }
+
+    if(Boolean.TRUE.equals(variableValuesIgnoreCase)) {
+      query.matchVariableValuesIgnoreCase();
+    }
+
     if (variables != null) {
 
       for (VariableQueryParameterDto variableQueryParam : variables) {
@@ -266,5 +287,4 @@ protected void applySortBy(CaseExecutionQuery query, String sortBy, Map<String,
       query.orderByTenantId();
     }
   }
-
 }
diff --git a/...gine-rest/src/main/java/org/camunda/bpm/engine/rest/dto/runtime/CaseInstanceQueryDto.java b/...gine-rest/src/main/java/org/camunda/bpm/engine/rest/dto/runtime/CaseInstanceQueryDto.java
@@ -74,6 +74,9 @@ public class CaseInstanceQueryDto extends AbstractQueryDto<CaseInstanceQuery> {
 
   protected List<VariableQueryParameterDto> variables;
 
+  protected Boolean variableNamesIgnoreCase;
+  protected Boolean variableValuesIgnoreCase;
+
   public CaseInstanceQueryDto() {
   }
 
@@ -156,6 +159,16 @@ public void setVariables(List<VariableQueryParameterDto> variables) {
     this.variables = variables;
   }
 
+  @CamundaQueryParam(value = "variableNamesIgnoreCase", converter = BooleanConverter.class)
+  public void setVariableNamesIgnoreCase(Boolean variableNamesIgnoreCase) {
+    this.variableNamesIgnoreCase = variableNamesIgnoreCase;
+  }
+
+  @CamundaQueryParam(value = "variableValuesIgnoreCase", converter = BooleanConverter.class)
+  public void setVariableValuesIgnoreCase(Boolean variableValuesIgnoreCase) {
+    this.variableValuesIgnoreCase = variableValuesIgnoreCase;
+  }
+
   @Override
   protected boolean isValidSortByValue(String value) {
     return VALID_SORT_BY_VALUES.contains(value);
@@ -210,6 +223,12 @@ protected void applyFilters(CaseInstanceQuery query) {
     if (terminated != null && terminated == true) {
       query.terminated();
     }
+    if(Boolean.TRUE.equals(variableNamesIgnoreCase)) {
+      query.matchVariableNamesIgnoreCase();
+    }
+    if(Boolean.TRUE.equals(variableValuesIgnoreCase)) {
+      query.matchVariableValuesIgnoreCase();
+    }
     if (variables != null) {
 
       for (VariableQueryParameterDto variableQueryParam : variables) {

diff --git a/.../engine-rest/src/main/java/org/camunda/bpm/engine/rest/dto/runtime/ExecutionQueryDto.java b/.../engine-rest/src/main/java/org/camunda/bpm/engine/rest/dto/runtime/ExecutionQueryDto.java
@@ -69,6 +69,9 @@ public class ExecutionQueryDto extends AbstractQueryDto<ExecutionQuery> {
   private List<VariableQueryParameterDto> variables;
   private List<VariableQueryParameterDto> processVariables;
 
+  Boolean variableValuesIgnoreCase;
+  Boolean variableNamesIgnoreCase;
+
   public ExecutionQueryDto() {
 
   }
@@ -122,6 +125,16 @@ public void setProcessVariables(List<VariableQueryParameterDto> processVariables
     this.processVariables = processVariables;
   }
 
+  @CamundaQueryParam(value = "variableValuesIgnoreCase", converter = BooleanConverter.class)
+  public void setVariableValuesIgnoreCase(Boolean variableValuesIgnoreCase) {
+    this.variableValuesIgnoreCase = variableValuesIgnoreCase;
+  }
+
+  @CamundaQueryParam(value = "variableNamesIgnoreCase", converter = BooleanConverter.class)
+  public void setVariableNamesIgnoreCase(Boolean variableNamesIgnoreCase) {
+    this.variableNamesIgnoreCase = variableNamesIgnoreCase;
+  }
+
   @CamundaQueryParam(value = "active", converter = BooleanConverter.class)
   public void setActive(Boolean active) {
     this.active = active;
@@ -211,7 +224,12 @@ protected void applyFilters(ExecutionQuery query) {
     if (tenantIdIn != null && !tenantIdIn.isEmpty()) {
       query.tenantIdIn(tenantIdIn.toArray(new String[tenantIdIn.size()]));
     }
-
+    if(Boolean.TRUE.equals(variableNamesIgnoreCase)) {
+      query.matchVariableNamesIgnoreCase();
+    }
+    if(Boolean.TRUE.equals(variableValuesIgnoreCase)) {
+      query.matchVariableValuesIgnoreCase();
+    }
     if (variables != null) {
       for (VariableQueryParameterDto variableQueryParam : variables) {
         String variableName = variableQueryParam.getName();

diff --git a/...e-rest/src/main/java/org/camunda/bpm/engine/rest/dto/runtime/ProcessInstanceQueryDto.java b/...e-rest/src/main/java/org/camunda/bpm/engine/rest/dto/runtime/ProcessInstanceQueryDto.java
@@ -85,6 +85,9 @@ public class ProcessInstanceQueryDto extends AbstractQueryDto<ProcessInstanceQue
   private Boolean leafProcessInstances;
   private Boolean isProcessDefinitionWithoutTenantId;
 
+  protected Boolean variableNamesIgnoreCase;
+  protected Boolean variableValuesIgnoreCase;
+
   private List<VariableQueryParameterDto> variables;
 
   private List<ProcessInstanceQueryDto> orQueries;
@@ -246,6 +249,24 @@ public void setVariables(List<VariableQueryParameterDto> variables) {
     this.variables = variables;
   }
 
+  public Boolean isVariableNamesIgnoreCase() {
+    return variableNamesIgnoreCase;
+  }
+
+  @CamundaQueryParam(value = "variableNamesIgnoreCase", converter = BooleanConverter.class)
+  public void setVariableNamesIgnoreCase(Boolean variableNamesCaseInsensitive) {
+    this.variableNamesIgnoreCase = variableNamesCaseInsensitive;
+  }
+
+  public Boolean isVariableValuesIgnoreCase() {
+    return variableValuesIgnoreCase;
+  }
+
+  @CamundaQueryParam(value ="variableValuesIgnoreCase", converter = BooleanConverter.class)
+  public void setVariableValuesIgnoreCase(Boolean variableValuesCaseInsensitive) {
+    this.variableValuesIgnoreCase = variableValuesCaseInsensitive;
+  }
+
   public Boolean isWithIncident() {
     return withIncident;
   }
@@ -448,6 +469,12 @@ protected void applyFilters(ProcessInstanceQuery query) {
     if (TRUE.equals(isProcessDefinitionWithoutTenantId)) {
       query.processDefinitionWithoutTenantId();
     }
+    if(TRUE.equals(variableNamesIgnoreCase)) {
+      query.matchVariableNamesIgnoreCase();
+    }
+    if(TRUE.equals(variableValuesIgnoreCase)) {
+      query.matchVariableValuesIgnoreCase();
+    }
     if (variables != null) {
       for (VariableQueryParameterDto variableQueryParam : variables) {
         String variableName = variableQueryParam.getName();

diff --git a/...-rest/src/main/java/org/camunda/bpm/engine/rest/dto/runtime/VariableInstanceQueryDto.java b/...-rest/src/main/java/org/camunda/bpm/engine/rest/dto/runtime/VariableInstanceQueryDto.java
@@ -27,6 +27,7 @@
 import org.camunda.bpm.engine.rest.dto.AbstractQueryDto;
 import org.camunda.bpm.engine.rest.dto.CamundaQueryParam;
 import org.camunda.bpm.engine.rest.dto.VariableQueryParameterDto;
+import org.camunda.bpm.engine.rest.dto.converter.BooleanConverter;
 import org.camunda.bpm.engine.rest.dto.converter.StringArrayConverter;
 import org.camunda.bpm.engine.rest.dto.converter.StringListConverter;
 import org.camunda.bpm.engine.rest.dto.converter.VariableListConverter;
@@ -57,6 +58,8 @@ public class VariableInstanceQueryDto extends AbstractQueryDto<VariableInstanceQ
   protected String variableName;
   protected String variableNameLike;
   protected List<VariableQueryParameterDto> variableValues;
+  protected Boolean variableNamesIgnoreCase;
+  protected Boolean variableValuesIgnoreCase;
   protected String[] executionIdIn;
   protected String[] processInstanceIdIn;
   protected String[] caseExecutionIdIn;
@@ -87,6 +90,16 @@ public void setVariableValues(List<VariableQueryParameterDto> variableValues) {
     this.variableValues = variableValues;
   }
 
+  @CamundaQueryParam(value = "variableNamesIgnoreCase", converter = BooleanConverter.class)
+  public void setVariableNamesIgnoreCase(Boolean variableNamesIgnoreCase) {
+    this.variableNamesIgnoreCase = variableNamesIgnoreCase;
+  }
+
+  @CamundaQueryParam(value = "variableValuesIgnoreCase", converter = BooleanConverter.class)
+  public void setVariableValuesIgnoreCase(Boolean variableValuesIgnoreCase) {
+    this.variableValuesIgnoreCase = variableValuesIgnoreCase;
+  }
+
   @CamundaQueryParam(value="executionIdIn", converter = StringArrayConverter.class)
   public void setExecutionIdIn(String[] executionIdIn) {
     this.executionIdIn = executionIdIn;
@@ -147,6 +160,14 @@ protected void applyFilters(VariableInstanceQuery query) {
       query.variableNameLike(variableNameLike);
     }
 
+    if(Boolean.TRUE.equals(variableNamesIgnoreCase)) {
+      query.matchVariableNamesIgnoreCase();
+    }
+
+    if(Boolean.TRUE.equals(variableValuesIgnoreCase)) {
+      query.matchVariableValuesIgnoreCase();
+    }
+
     if (variableValues != null) {
       for (VariableQueryParameterDto variableQueryParam : variableValues) {
         String variableName = variableQueryParam.getName();