diff --git a/elide-async/src/main/java/com/yahoo/elide/async/export/validator/NoRelationshipsProjectionValidator.java b/elide-async/src/main/java/com/yahoo/elide/async/export/validator/NoRelationshipsProjectionValidator.java index 4ec79a7615..215b54a726 100644 --- a/elide-async/src/main/java/com/yahoo/elide/async/export/validator/NoRelationshipsProjectionValidator.java +++ b/elide-async/src/main/java/com/yahoo/elide/async/export/validator/NoRelationshipsProjectionValidator.java @@ -15,12 +15,6 @@ */ public class NoRelationshipsProjectionValidator implements Validator { - private static final Validator INSTANCE = new NoRelationshipsProjectionValidator(); - - public static Validator getInstance() { - return INSTANCE; - } - @Override public void validateProjection(Collection projections) { for (EntityProjection projection : projections) { diff --git a/elide-async/src/main/java/com/yahoo/elide/async/export/validator/SingleRootProjectionValidator.java b/elide-async/src/main/java/com/yahoo/elide/async/export/validator/SingleRootProjectionValidator.java index 1701a09d54..3704284a3f 100644 --- a/elide-async/src/main/java/com/yahoo/elide/async/export/validator/SingleRootProjectionValidator.java +++ b/elide-async/src/main/java/com/yahoo/elide/async/export/validator/SingleRootProjectionValidator.java @@ -15,12 +15,6 @@ */ public class SingleRootProjectionValidator implements Validator { - private static final Validator INSTANCE = new SingleRootProjectionValidator(); - - public static Validator getInstance() { - return INSTANCE; - } - @Override public void validateProjection(Collection projections) { if (projections.size() != 1) { diff --git a/elide-async/src/main/java/com/yahoo/elide/async/operation/GraphQLTableExportOperation.java b/elide-async/src/main/java/com/yahoo/elide/async/operation/GraphQLTableExportOperation.java index f858f86392..1e84609ab9 100644 --- a/elide-async/src/main/java/com/yahoo/elide/async/operation/GraphQLTableExportOperation.java +++ b/elide-async/src/main/java/com/yahoo/elide/async/operation/GraphQLTableExportOperation.java @@ -42,7 +42,7 @@ public class GraphQLTableExportOperation extends TableExportOperation { public GraphQLTableExportOperation(TableExportFormatter formatter, AsyncExecutorService service, AsyncAPI export, RequestScope scope, ResultStorageEngine engine) { super(formatter, service, export, scope, engine, - Arrays.asList(NoRelationshipsProjectionValidator.getInstance())); + Arrays.asList(new NoRelationshipsProjectionValidator())); } @Override diff --git a/elide-async/src/main/java/com/yahoo/elide/async/operation/JSONAPITableExportOperation.java b/elide-async/src/main/java/com/yahoo/elide/async/operation/JSONAPITableExportOperation.java index d630cea4e2..c444664c8e 100644 --- a/elide-async/src/main/java/com/yahoo/elide/async/operation/JSONAPITableExportOperation.java +++ b/elide-async/src/main/java/com/yahoo/elide/async/operation/JSONAPITableExportOperation.java @@ -39,7 +39,7 @@ public class JSONAPITableExportOperation extends TableExportOperation { public JSONAPITableExportOperation(TableExportFormatter formatter, AsyncExecutorService service, AsyncAPI export, RequestScope scope, ResultStorageEngine engine) { super(formatter, service, export, scope, engine, - Arrays.asList(NoRelationshipsProjectionValidator.getInstance())); + Arrays.asList(new NoRelationshipsProjectionValidator())); } @Override diff --git a/elide-async/src/main/java/com/yahoo/elide/async/operation/TableExportOperation.java b/elide-async/src/main/java/com/yahoo/elide/async/operation/TableExportOperation.java index d8f1857dd3..669ef26b4d 100644 --- a/elide-async/src/main/java/com/yahoo/elide/async/operation/TableExportOperation.java +++ b/elide-async/src/main/java/com/yahoo/elide/async/operation/TableExportOperation.java @@ -51,7 +51,7 @@ public abstract class TableExportOperation implements Callable { private TableExport exportObj; private RequestScope scope; private ResultStorageEngine engine; - private List validators = new ArrayList<>(Arrays.asList(SingleRootProjectionValidator.getInstance())); + private List validators = new ArrayList<>(Arrays.asList(new SingleRootProjectionValidator())); public TableExportOperation(TableExportFormatter formatter, AsyncExecutorService service, AsyncAPI exportObj, RequestScope scope, ResultStorageEngine engine, List validators) {