aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Smokowski <ss835w@att.com>2019-07-29 12:42:01 +0000
committerGerrit Code Review <gerrit@onap.org>2019-07-29 12:42:01 +0000
commitab18c3ca22cff9e2bba5bddda0a50987541cf173 (patch)
tree472e928b31e1b18b8feab5e08053d1b4ce45bd66
parent128fcc30cf60e9ddb3bc3df3c5486602f535f208 (diff)
parented1ab977f02bff4dbbb931cceb8ac9ac676fcd3f (diff)
Merge "Vulnerability fixes in ServicePluginFactory"
-rw-r--r--bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/workflow/service/ServicePluginFactory.java15
1 files changed, 8 insertions, 7 deletions
diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/workflow/service/ServicePluginFactory.java b/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/workflow/service/ServicePluginFactory.java
index 95be6ba7fc..1516f289fe 100644
--- a/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/workflow/service/ServicePluginFactory.java
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/workflow/service/ServicePluginFactory.java
@@ -89,6 +89,14 @@ public class ServicePluginFactory {
private static ServicePluginFactory instance;
+ private static final String CUSTOM_RESOURCE_TP = "custom-resource-tp";
+ private static final String VS_MONITORED = "VS_assured";
+ private static final String VS_UNMONITORED = "VS_besteffort";
+ private static final String TS_MONITORED = "TS1";
+ private static final String TS_UNMONITORED = "TS2";
+ private static final String CUSTOM_TP_LIST[] =
+ new String[] {VS_MONITORED, VS_UNMONITORED, TS_MONITORED, TS_UNMONITORED};
+
static {
try (InputStream is = ClassLoader.class.getResourceAsStream("/application.properties")) {
Properties prop = new Properties();
@@ -351,13 +359,6 @@ public class ServicePluginFactory {
return false;
}
- public static String CUSTOM_RESOURCE_TP = "custom-resource-tp";
- public static String VS_MONITORED = "VS_assured";
- public static String VS_UNMONITORED = "VS_besteffort";
- public static String TS_MONITORED = "TS1";
- public static String TS_UNMONITORED = "TS2";
- public static String CUSTOM_TP_LIST[] = new String[] {VS_MONITORED, VS_UNMONITORED, TS_MONITORED, TS_UNMONITORED};
-
private void customizeTP(Map<String, Object> crossTps, String svcName, DelegateExecution execution) {
Optional<String> customType = Arrays.stream(CUSTOM_TP_LIST).filter(svcName::contains).findFirst();
if (customType.isPresent()) {