From d06d2ffb9f555485bb3fa2839e03d02f7d8c127e Mon Sep 17 00:00:00 2001
From: "Benjamin, Max (mb388a)" <mb388a@us.att.com>
Date: Mon, 4 Mar 2019 09:43:34 -0500
Subject: flow validators can be skipped via an annotation

flow validators can now be skipped via an annotation

Change-Id: I7796d5829aacee466419d558dfc95a761125577a
Issue-ID: SO-1589
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
---
 .../common/validation/FlowValidatorRunner.java     |  2 +-
 .../org/onap/so/bpmn/common/validation/Skip.java   |  9 +++++
 .../common/validation/MyDisabledValidator.java     | 44 ++++++++++++++++++++++
 3 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/validation/Skip.java
 create mode 100644 bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/validation/MyDisabledValidator.java

(limited to 'bpmn')

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/validation/FlowValidatorRunner.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/validation/FlowValidatorRunner.java
index 636c8e32cf..5352fc2fe0 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/validation/FlowValidatorRunner.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/validation/FlowValidatorRunner.java
@@ -122,7 +122,7 @@ public abstract class FlowValidatorRunner<S extends FlowValidator, E extends Flo
 	protected List<FlowValidator> filterValidators(List<? extends FlowValidator> validators, String bbName) {
 		return validators.stream()
 				.filter(item -> {
-					return item.shouldRunFor(bbName);
+					return !item.getClass().isAnnotationPresent(Skip.class) && item.shouldRunFor(bbName);
 				})
 				.sorted(Comparator.comparing(item -> {
 					Priority p = Optional.ofNullable(item.getClass().getAnnotation(Priority.class)).orElse(new Priority() {
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/validation/Skip.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/validation/Skip.java
new file mode 100644
index 0000000000..0148e8f10c
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/validation/Skip.java
@@ -0,0 +1,9 @@
+package org.onap.so.bpmn.common.validation;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Skip {
+
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/validation/MyDisabledValidator.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/validation/MyDisabledValidator.java
new file mode 100644
index 0000000000..78e4791b1c
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/common/validation/MyDisabledValidator.java
@@ -0,0 +1,44 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.bpmn.common.validation;
+
+import java.util.Collections;
+import java.util.Optional;
+
+import org.onap.so.bpmn.common.BuildingBlockExecution;
+import org.springframework.stereotype.Component;
+
+@Component
+@Skip
+public class MyDisabledValidator implements PreBuildingBlockValidator {
+
+	@Override
+	public boolean shouldRunFor(String bbName) {
+		
+		return Collections.singleton("test").contains(bbName);
+	}
+
+	@Override
+	public Optional<String> validate(BuildingBlockExecution exeuction) {
+		return Optional.of("my-disabled-validator");
+	}
+
+}
-- 
cgit 1.2.3-korg