MINIFI-44 Merge release branch into master for 0.0.1 Release
diff --git a/minifi-commons/minifi-commons-schema/src/main/java/org/apache/nifi/minifi/commons/schema/ConfigSchema.java b/minifi-commons/minifi-commons-schema/src/main/java/org/apache/nifi/minifi/commons/schema/ConfigSchema.java
index 57f9124..4b4757a 100644
--- a/minifi-commons/minifi-commons-schema/src/main/java/org/apache/nifi/minifi/commons/schema/ConfigSchema.java
+++ b/minifi-commons/minifi-commons-schema/src/main/java/org/apache/nifi/minifi/commons/schema/ConfigSchema.java
@@ -119,7 +119,7 @@
}
private void checkForDuplicateNames(String errorMessagePrefix, List<String> names) {
- if (processors != null) {
+ if (names != null) {
Set<String> seenNames = new HashSet<>();
Set<String> duplicateNames = new TreeSet<>();
for (String name : names) {
diff --git a/minifi-commons/minifi-commons-schema/src/test/java/org/apache/nifi/minifi/commons/schema/ConfigSchemaTest.java b/minifi-commons/minifi-commons-schema/src/test/java/org/apache/nifi/minifi/commons/schema/ConfigSchemaTest.java
new file mode 100644
index 0000000..e1575c3
--- /dev/null
+++ b/minifi-commons/minifi-commons-schema/src/test/java/org/apache/nifi/minifi/commons/schema/ConfigSchemaTest.java
@@ -0,0 +1,91 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 org.apache.nifi.minifi.commons.schema;
+
+import org.apache.nifi.minifi.commons.schema.common.CommonPropertyKeys;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.fail;
+
+public class ConfigSchemaTest {
+
+ @Test
+ public void testProcessorDuplicateValidationNegativeCase() {
+ ConfigSchema configSchema = new ConfigSchema(Collections.singletonMap(CommonPropertyKeys.PROCESSORS_KEY, getListWithNames("testName1", "testName2")));
+ assertMessageDoesNotExist(configSchema, ConfigSchema.FOUND_THE_FOLLOWING_DUPLICATE_PROCESSOR_NAMES);
+ }
+
+ @Test
+ public void testProcessorDuplicateValidationPositiveCase() {
+ ConfigSchema configSchema = new ConfigSchema(Collections.singletonMap(CommonPropertyKeys.PROCESSORS_KEY, getListWithNames("testName1", "testName1")));
+ assertMessageDoesExist(configSchema, ConfigSchema.FOUND_THE_FOLLOWING_DUPLICATE_PROCESSOR_NAMES);
+ }
+
+ @Test
+ public void testConnectionDuplicateValidationNegativeCase() {
+ ConfigSchema configSchema = new ConfigSchema(Collections.singletonMap(CommonPropertyKeys.CONNECTIONS_KEY, getListWithNames("testName1", "testName2")));
+ assertMessageDoesNotExist(configSchema, ConfigSchema.FOUND_THE_FOLLOWING_DUPLICATE_CONNECTION_NAMES);
+ }
+
+ @Test
+ public void testConnectionDuplicateValidationPositiveCase() {
+ ConfigSchema configSchema = new ConfigSchema(Collections.singletonMap(CommonPropertyKeys.CONNECTIONS_KEY, getListWithNames("testName1", "testName1")));
+ assertMessageDoesExist(configSchema, ConfigSchema.FOUND_THE_FOLLOWING_DUPLICATE_CONNECTION_NAMES);
+ }
+
+ @Test
+ public void testRemoteProcessingGroupDuplicateValidationNegativeCase() {
+ ConfigSchema configSchema = new ConfigSchema(Collections.singletonMap(CommonPropertyKeys.REMOTE_PROCESSING_GROUPS_KEY, getListWithNames("testName1", "testName2")));
+ assertMessageDoesNotExist(configSchema, ConfigSchema.FOUND_THE_FOLLOWING_DUPLICATE_REMOTE_PROCESSING_GROUP_NAMES);
+ }
+
+ @Test
+ public void testRemoteProcessingGroupDuplicateValidationPositiveCase() {
+ ConfigSchema configSchema = new ConfigSchema(Collections.singletonMap(CommonPropertyKeys.REMOTE_PROCESSING_GROUPS_KEY, getListWithNames("testName1", "testName1")));
+ assertMessageDoesExist(configSchema, ConfigSchema.FOUND_THE_FOLLOWING_DUPLICATE_REMOTE_PROCESSING_GROUP_NAMES);
+ }
+
+ private List<Map<String, Object>> getListWithNames(String... names) {
+ List<Map<String, Object>> result = new ArrayList<>(names.length);
+ for (String name : names) {
+ result.add(Collections.singletonMap(CommonPropertyKeys.NAME_KEY, name));
+ }
+ return result;
+ }
+
+ private void assertMessageDoesNotExist(ConfigSchema configSchema, String message) {
+ for (String validationIssue : configSchema.validationIssues) {
+ assertFalse("Did not expect to find message: " + validationIssue, validationIssue.startsWith(message));
+ }
+ }
+
+ private void assertMessageDoesExist(ConfigSchema configSchema, String message) {
+ for (String validationIssue : configSchema.validationIssues) {
+ if (validationIssue.startsWith(message)) {
+ return;
+ }
+ }
+ fail("Expected to find message starting with: " + message);
+ }
+}
