diff options
| author |   Chuanyu Chen <chenchuanyu@huawei.com> | 2018-04-18 12:40:16 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-04-18 12:40:16 +0000 |
| commit | cb28756cf544a5dd6d35d6a134a471181c0abcc1 (patch) | |
| tree | aca04ad81f6ee46fbcedc59653a0ad302072b549 /bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp | |
| parent | 21005fb11f754fd25d5a2c2872c0834950295ccf (diff) | |
| parent | 17d4e43f11ac66fa1d5cba27894f440fae877818 (diff) | |
Merge "Add resource sequence if config file not defined"
Diffstat (limited to 'bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp')
2 files changed, 1 insertions, 34 deletions
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/properties/BPMNProperties.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/properties/BPMNProperties.java index acf8f052cd..dbb552c818 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/properties/BPMNProperties.java +++ b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/properties/BPMNProperties.java @@ -52,9 +52,6 @@ public class BPMNProperties { if (resourceSequence != null) { return Arrays.asList(resourceSequence.split(",")); } - return Arrays.asList(ResourceSequence.RESOURCE_EPC, - ResourceSequence.RESOURCE_IMS, - ResourceSequence.RESOUCE_OVERLAY, - ResourceSequence.RESOURCE_UNDERLAY); + return null; } } diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/properties/ResourceSequence.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/properties/ResourceSequence.java deleted file mode 100644 index 86e5d30b11..0000000000 --- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/properties/ResourceSequence.java +++ /dev/null @@ -1,30 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP - SO - * ================================================================================ - * Copyright (C) 2018 Huawei 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.openecomp.mso.bpmn.infrastructure.properties; - -public final class ResourceSequence { - - public static final String RESOURCE_IMS = "ims"; - public static final String RESOURCE_EPC = "epc"; - public static final String RESOUCE_OVERLAY = "overlay"; - public static final String RESOURCE_UNDERLAY = "underlay"; - - private ResourceSequence() {} -}
\ No newline at end of file |