From 924cd4c39b4680a855acd686fc08fcfb67c79f97 Mon Sep 17 00:00:00 2001 From: Florent Biville Date: Mon, 16 Dec 2024 15:01:49 +0100 Subject: [PATCH] feat: drop node target's key constraint requirement This blocks Community Edition (CE) users, as the only way to emulate key constraints is to combine unique constraints (available in CE) with existence constraints (available only in Enterprise Edition). --- .../model/validation/NodeKeyValidator.java | 53 ------------------- ...orter.v1.validation.SpecificationValidator | 1 - 2 files changed, 54 deletions(-) delete mode 100644 v2/googlecloud-to-neo4j/src/main/java/com/google/cloud/teleport/v2/neo4j/model/validation/NodeKeyValidator.java diff --git a/v2/googlecloud-to-neo4j/src/main/java/com/google/cloud/teleport/v2/neo4j/model/validation/NodeKeyValidator.java b/v2/googlecloud-to-neo4j/src/main/java/com/google/cloud/teleport/v2/neo4j/model/validation/NodeKeyValidator.java deleted file mode 100644 index ecc4372e44..0000000000 --- a/v2/googlecloud-to-neo4j/src/main/java/com/google/cloud/teleport/v2/neo4j/model/validation/NodeKeyValidator.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (C) 2024 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.google.cloud.teleport.v2.neo4j.model.validation; - -import java.util.LinkedHashSet; -import java.util.Set; -import org.neo4j.importer.v1.targets.NodeTarget; -import org.neo4j.importer.v1.validation.SpecificationValidationResult.Builder; -import org.neo4j.importer.v1.validation.SpecificationValidator; - -public class NodeKeyValidator implements SpecificationValidator { - - private static final String ERROR_CODE = "DFNK-001"; - private final Set paths; - - public NodeKeyValidator() { - this.paths = new LinkedHashSet<>(); - } - - @Override - public void visitNodeTarget(int index, NodeTarget target) { - var schema = target.getSchema(); - if (schema == null) { - paths.add(String.format("$.targets.nodes[%d].schema.key_constraints", index)); - return; - } - if (schema.getKeyConstraints().isEmpty()) { - paths.add(String.format("$.targets.nodes[%d].schema.key_constraints", index)); - } - } - - @Override - public boolean report(Builder builder) { - paths.forEach( - path -> - builder.addError( - path, ERROR_CODE, String.format("%s must define at least 1 key constraint", path))); - return paths.isEmpty(); - } -} diff --git a/v2/googlecloud-to-neo4j/src/main/resources/META-INF/services/org.neo4j.importer.v1.validation.SpecificationValidator b/v2/googlecloud-to-neo4j/src/main/resources/META-INF/services/org.neo4j.importer.v1.validation.SpecificationValidator index 8ccfbd6008..59f2256ba3 100644 --- a/v2/googlecloud-to-neo4j/src/main/resources/META-INF/services/org.neo4j.importer.v1.validation.SpecificationValidator +++ b/v2/googlecloud-to-neo4j/src/main/resources/META-INF/services/org.neo4j.importer.v1.validation.SpecificationValidator @@ -3,7 +3,6 @@ com.google.cloud.teleport.v2.neo4j.model.validation.BigQuerySourceProjectDataset com.google.cloud.teleport.v2.neo4j.model.validation.DuplicateAggregateFieldNameValidator com.google.cloud.teleport.v2.neo4j.model.validation.DuplicateTextHeaderValidator com.google.cloud.teleport.v2.neo4j.model.validation.InlineSourceDataValidator -com.google.cloud.teleport.v2.neo4j.model.validation.NodeKeyValidator com.google.cloud.teleport.v2.neo4j.model.validation.TextColumnMappingValidator com.google.cloud.teleport.v2.neo4j.model.validation.WriteModeValidator com.google.cloud.teleport.v2.neo4j.model.validation.NodeMatchModeValidator