Add is null / is not null filter on parentId (#100)

Author: AlexFalessi

scheduling-api-graphql/scheduling-api-graphql-beans/scheduling-api-graphql-beans-input/src/main/java/org/ow2/proactive/scheduling/api/graphql/beans/input/JobInput.java

@@ -119,6 +119,8 @@ public static class Builder {
 
  private String beforeParentId;
 
+ private String parentIdNullStatus;
+
  private String afterChildrenCount;
 
  private String beforeChildrenCount;
@@ -232,6 +234,11 @@ public JobInput.Builder afterParentId(String afterParentId) {
  return this;
  }
 
+ public JobInput.Builder parentIdNullStatus(String nullStatus) {
+ this.parentIdNullStatus = nullStatus;
+ return this;
+ }
+
  public JobInput.Builder beforeChildrenCount(String beforeChildrenCount) {
  this.beforeChildrenCount = beforeChildrenCount;
  return this;
@@ -481,7 +488,10 @@ public JobInput build() {
  this.beforeCumulatedCoreTime,
  this.afterCumulatedCoreTime);
 
- comparableLongString(InputFields.PARENT_ID.getName(), this.beforeParentId, this.afterParentId);
+ comparableLongStringWithNullStatus(InputFields.PARENT_ID.getName(),
+ this.beforeParentId,
+ this.afterParentId,
+ this.parentIdNullStatus);
 
  comparableLongString(InputFields.CHILDREN_COUNT.getName(),
  this.beforeChildrenCount,
@@ -529,6 +539,26 @@ private void comparableLongString(String longName, String beforeValue, String af
  sb.append(" }").append(Constants.RETURN);
  }
  }
+
+ private void comparableLongStringWithNullStatus(String longName, String beforeValue, String afterValue,
+ String nullStatus) {
+ if (!Strings.isNullOrEmpty(beforeValue) || !Strings.isNullOrEmpty(afterValue) ||
+ !Strings.isNullOrEmpty(nullStatus)) {
+ sb.append(' ');
+ sb.append(longName);
+ sb.append(" : {");
+ if (!Strings.isNullOrEmpty(beforeValue)) {
+ sb.append(String.format(" %s : ", InputFields.BEFORE.getName())).append(beforeValue);
+ }
+ if (!Strings.isNullOrEmpty(afterValue)) {
+ sb.append(String.format(" %s : ", InputFields.AFTER.getName())).append(afterValue);
+ }
+ if (!Strings.isNullOrEmpty(nullStatus)) {
+ sb.append(String.format(" %s : ", InputFields.NULL_STATUS.getName())).append(nullStatus);
+ }
+ sb.append(" }").append(Constants.RETURN);
+ }
+ }
  }
 
 }

scheduling-api-graphql/scheduling-api-graphql-common/src/main/java/org/ow2/proactive/scheduling/api/graphql/common/Fields.java

@@ -41,6 +41,7 @@ public enum Fields {
  DESCRIPTION,
  EDGES,
  END_CURSOR,
+ NULL_STATUS,
  EXECUTION_DURATION,
  EXECUTION_HOST_NAME,
  FINISHED_TIME,

scheduling-api-graphql/scheduling-api-graphql-common/src/main/java/org/ow2/proactive/scheduling/api/graphql/common/InputFields.java

@@ -44,6 +44,7 @@ public enum InputFields {
  KEY,
  LAST_UPDATED_TIME,
  NAME,
+ NULL_STATUS,
  OWNER,
  TENANT,
  PRIORITY,

scheduling-api-graphql/scheduling-api-graphql-common/src/main/java/org/ow2/proactive/scheduling/api/graphql/common/Inputs.java

@@ -46,6 +46,21 @@ public static <T> T getValue(Map<String, Object> input, String fieldName, T defa
  }
  }
 
+ public static <T extends Enum> T getEnumValue(Map<String, Object> input, String fieldName, T defaultValue) {
+
+ Object fieldValue = input.get(fieldName);
+
+ if (fieldValue != null) {
+ if (fieldValue instanceof String) {
+ return (T) T.valueOf(defaultValue.getClass(), (String) fieldValue);
+ } else {
+ return (T) fieldValue;
+ }
+ } else {
+ return defaultValue;
+ }
+ }
+
  public static <T> T getObject(Map<String, Object> input, String fieldName, Function<Map<String, Object>, T> mapper,
  T defaultValue) {
 

scheduling-api-graphql/scheduling-api-graphql-common/src/main/java/org/ow2/proactive/scheduling/api/graphql/common/NullStatus.java

@@ -0,0 +1,32 @@
+/*
+ * ProActive Parallel Suite(TM):
+ * The Open Source library for parallel and distributed
+ * Workflows & Scheduling, Orchestration, Cloud Automation
+ * and Big Data Analysis on Enterprise Grids & Clouds.
+ *
+ * Copyright (c) 2007 - 2017 ActiveEon
+ * Contact: contact@activeeon.com
+ *
+ * This library is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License
+ * as published by the Free Software Foundation: version 3 of
+ * the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * If needed, contact us to obtain a release under GPL Version 2 or 3
+ * or a different license than the AGPL.
+ */
+package org.ow2.proactive.scheduling.api.graphql.common;
+
+public enum NullStatus {
+ NULL,
+ NOT_NULL,
+ ANY
+}

scheduling-api-graphql/scheduling-api-graphql-fetchers/src/main/java/org/ow2/proactive/scheduling/api/graphql/fetchers/converter/JobInputConverter.java

@@ -46,6 +46,7 @@
 import org.ow2.proactive.scheduler.core.db.JobDataVariable;
 import org.ow2.proactive.scheduling.api.graphql.common.GraphqlContext;
 import org.ow2.proactive.scheduling.api.graphql.common.InputFields;
+import org.ow2.proactive.scheduling.api.graphql.common.NullStatus;
 import org.ow2.proactive.scheduling.api.graphql.common.Types;
 import org.ow2.proactive.scheduling.api.graphql.schema.type.User;
 import org.ow2.proactive.scheduling.api.graphql.schema.type.inputs.ComparableIntegerInput;
@@ -353,9 +354,11 @@ private void comparableLongPredicated(ComparableLongInput input, String name, Ro
  CriteriaBuilder criteriaBuilder, List<Predicate> predicates, boolean filterZeroLess) {
  long before = -1;
  long after = -1;
+ NullStatus nullStatus = NullStatus.ANY;
  if (input != null) {
  before = input.getBefore();
  after = input.getAfter();
+ nullStatus = input.getNullStatus();
  }
  if (before != -1L) {
  predicates.add(criteriaBuilder.lessThanOrEqualTo(root.get(name), before));
@@ -366,22 +369,38 @@ private void comparableLongPredicated(ComparableLongInput input, String name, Ro
  if (after != -1L) {
  predicates.add(criteriaBuilder.greaterThanOrEqualTo(root.get(name), after));
  }
+ if (nullStatus != NullStatus.ANY) {
+ if (nullStatus.equals(NullStatus.NOT_NULL)) {
+ predicates.add(criteriaBuilder.isNotNull(root.get(name)));
+ } else {
+ predicates.add(criteriaBuilder.isNull(root.get(name)));
+ }
+ }
  }
 
  private void comparableIntegerPredicated(ComparableIntegerInput input, String name, Root<JobData> root,
  CriteriaBuilder criteriaBuilder, List<Predicate> predicates) {
  int before = -1;
  int after = -1;
+ NullStatus nullStatus = NullStatus.ANY;
  if (input != null) {
  before = input.getBefore();
  after = input.getAfter();
+ nullStatus = input.getNullStatus();
  }
  if (before != -1) {
  predicates.add(criteriaBuilder.lessThanOrEqualTo(root.get(name), before));
  }
  if (after != -1) {
  predicates.add(criteriaBuilder.greaterThanOrEqualTo(root.get(name), after));
  }
+ if (nullStatus != NullStatus.ANY) {
+ if (nullStatus.equals(NullStatus.NOT_NULL)) {
+ predicates.add(criteriaBuilder.isNotNull(root.get(name)));
+ } else {
+ predicates.add(criteriaBuilder.isNull(root.get(name)));
+ }
+ }
  }
 
  @Override

scheduling-api-graphql/scheduling-api-graphql-schema/src/main/java/org/ow2/proactive/scheduling/api/graphql/schema/type/inputs/ComparableInput.java

@@ -25,13 +25,14 @@
  */
 package org.ow2.proactive.scheduling.api.graphql.schema.type.inputs;
 
-import static org.ow2.proactive.scheduling.api.graphql.common.InputFields.AFTER;
-import static org.ow2.proactive.scheduling.api.graphql.common.InputFields.BEFORE;
+import static org.ow2.proactive.scheduling.api.graphql.common.InputFields.*;
 
 import java.util.Map;
 
 import org.ow2.proactive.scheduling.api.graphql.common.Inputs;
+import org.ow2.proactive.scheduling.api.graphql.common.NullStatus;
 
+import graphql.schema.GraphQLEnumType;
 import lombok.Data;
 
 
@@ -42,17 +43,29 @@
 @Data
 public class ComparableInput<T> {
 
+ public final static GraphQLEnumType NullStatusEnum = GraphQLEnumType.newEnum()
+ .name(NULL_STATUS.getName())
+ .description("Check if the value is null or not null")
+ .value("NULL")
+ .value("NOT_NULL")
+ .value("ANY")
+ .build();
+
  protected final T before;
 
  protected final T after;
 
+ protected final NullStatus nullStatus;
+
  public ComparableInput(Map<String, Object> input, T defaultValue) {
  if (input != null) {
  before = Inputs.getValue(input, BEFORE.getName(), defaultValue);
  after = Inputs.getValue(input, AFTER.getName(), defaultValue);
+ nullStatus = Inputs.getEnumValue(input, NULL_STATUS.getName(), NullStatus.ANY);
  } else {
  before = defaultValue;
  after = defaultValue;
+ nullStatus = Inputs.getEnumValue(input, NULL_STATUS.getName(), NullStatus.ANY);
  }
  }
 }

scheduling-api-graphql/scheduling-api-graphql-schema/src/main/java/org/ow2/proactive/scheduling/api/graphql/schema/type/inputs/ComparableParentId.java

@@ -28,6 +28,8 @@
 import static graphql.scalars.java.JavaPrimitives.GraphQLLong;
 import static graphql.schema.GraphQLInputObjectField.newInputObjectField;
 import static graphql.schema.GraphQLInputObjectType.newInputObject;
+import static org.ow2.proactive.scheduling.api.graphql.common.Fields.NULL_STATUS;
+import static org.ow2.proactive.scheduling.api.graphql.common.Fields.STATUS;
 import static org.ow2.proactive.scheduling.api.graphql.common.InputFields.AFTER;
 import static org.ow2.proactive.scheduling.api.graphql.common.InputFields.BEFORE;
 
@@ -38,6 +40,8 @@
 
 import graphql.schema.DataFetcher;
 import graphql.schema.GraphQLInputType;
+import graphql.schema.GraphQLList;
+import graphql.schema.GraphQLNonNull;
 import lombok.Data;
 
 
@@ -60,6 +64,10 @@ public GraphQLInputType buildType(DataFetcher... dataFetchers) {
  .description("Jobs having parent id greater than this value.")
  .type(GraphQLLong)
  .build())
+ .field(newInputObjectField().name(NULL_STATUS.getName())
+ .description("Is the parent job id present")
+ .type(NullStatusEnum)
+ .build())
  .build();
  }
  };

scheduling-api-http/src/integration-test/java/org/ow2/proactive/scheduling/api/GraphqlServiceIntegrationTest.java

@@ -54,6 +54,7 @@
 import org.ow2.proactive.scheduler.core.db.TaskData;
 import org.ow2.proactive.scheduling.api.graphql.common.DefaultValues;
 import org.ow2.proactive.scheduling.api.graphql.common.GraphqlContext;
+import org.ow2.proactive.scheduling.api.graphql.common.NullStatus;
 import org.ow2.proactive.scheduling.api.graphql.schema.type.Query;
 import org.ow2.proactive.scheduling.api.graphql.service.GraphqlService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -290,6 +291,32 @@ public void testQueryJobsFilterByContainNames() {
  assertThat(jobNodes).hasSize(10);
  }
 
+ @Rollback
+ @Test
+ @Transactional
+ public void testQueryJobsFilterByEmptyParentId() {
+ addJobData(5);
+ addJobDataWithParentId(5);
+
+ String queryTest = "{\n" + " jobs (filter: {parentId: {nullStatus:%s}}){\n" + " edges {\n" +
+ " node {\n" + " id\n" + " parentId\n" + " name\n" +
+ " owner\n" + " submittedTime\n" + " status\n" + " }\n" +
+ " }\n" + " }\n" + "}";
+
+ Map<String, Object> queryResultAny = executeGraphqlQuery(String.format(queryTest, NullStatus.ANY));
+ List<?> jobNodes = (List<?>) getField(queryResultAny, "data", "jobs", "edges");
+ assertThat(jobNodes).hasSize(10);
+
+ Map<String, Object> queryResultNotNull = executeGraphqlQuery(String.format(queryTest, NullStatus.NOT_NULL));
+ jobNodes = (List<?>) getField(queryResultNotNull, "data", "jobs", "edges");
+ assertThat(jobNodes).hasSize(5);
+ assertThat(jobNodes.stream().allMatch(jobNode -> getField(jobNode, "node", "parentId") != null)).isTrue();
+
+ Map<String, Object> queryResultNull = executeGraphqlQuery(String.format(queryTest, NullStatus.NULL));
+ jobNodes = (List<?>) getField(queryResultNull, "data", "jobs", "edges");
+ assertThat(jobNodes.stream().allMatch(jobNode -> getField(jobNode, "node", "parentId") == null)).isTrue();
+ }
+
  @Rollback
  @Test
  @Transactional
@@ -1181,6 +1208,11 @@ private void addJobData(int nbJobs) {
  jobData.forEach(job -> entityManager.persist(job));
  }
 
+ private void addJobDataWithParentId(int nbJobs) {
+ List<JobData> jobData = createJobDataWithParentId(nbJobs);
+ jobData.forEach(job -> entityManager.persist(job));
+ }
+
  private void addJobDataWithTasks(int nbTasks) {
  JobData jobData = createJobData("job" + UUID.randomUUID().toString(),
  CONTEXT_USER_DATA.getUserName(),
@@ -1204,6 +1236,18 @@ private List<JobData> createJobData(int count) {
  .collect(Collectors.toList());
  }
 
+ private List<JobData> createJobDataWithParentId(int count) {
+ return IntStream.range(1, count + 1)
+ .mapToObj(index -> createJobData("job" + index,
+ index % 2 == 0 ? CONTEXT_USER_DATA.getUserName()
+ : "owner" + index,
+ index % 2 == 0 ? JobPriority.IDLE : JobPriority.HIGH,
+ "projectName" + index,
+ index % 2 == 0 ? JobStatus.CANCELED : JobStatus.KILLED,
+ (long) count))
+ .collect(Collectors.toList());
+ }
+
  private JobData createJobData(String name, String owner, JobPriority priority, String projectName,
  JobStatus status) {
  JobData jobData = new JobData();
@@ -1217,6 +1261,20 @@ private JobData createJobData(String name, String owner, JobPriority priority, S
  return jobData;
  }
 
+ private JobData createJobData(String name, String owner, JobPriority priority, String projectName, JobStatus status,
+ Long parentId) {
+ JobData jobData = new JobData();
+ jobData.setJobName(name);
+ jobData.setOwner(owner);
+ jobData.setPriority(priority);
+ jobData.setProjectName(projectName);
+ jobData.setStatus(status);
+ jobData.setParentId(parentId);
+ jobData.setOnTaskErrorString(OnTaskError.PAUSE_TASK.toString());
+
+ return jobData;
+ }
+
  private List<TaskData> createTaskData(JobData jobData, int nbTasks) {
  return IntStream.range(1, nbTasks + 1)
  .mapToObj(index -> createTaskData(jobData, index - 1, "task" + index))