diff options
author | 2019-05-22 16:41:09 +0200 | |
---|---|---|
committer | 2019-06-10 07:19:18 +0000 | |
commit | 91a31137b44d034823f72b190fc42539993c6593 (patch) | |
tree | 10e12209ec28691d51e85d4c01cd337cc3264bcd /catalog-be/src/main/java/org/openecomp/sdc/be/impl | |
parent | 1e744a3293de1598d119c35a5efeb71c97c40159 (diff) |
Inheritance in ComponentException
ComponentException was split into ByActionStatus and ByResponseFormat exceptions.
Test added for ComponentLockAspectTest in passing
Change-Id: I89c9ee966b8b4445e791af897bd60cdb845b845b
Issue-ID: SDC-2321
Signed-off-by: Tomasz Golabek <tomasz.golabek@nokia.com>
Diffstat (limited to 'catalog-be/src/main/java/org/openecomp/sdc/be/impl')
-rw-r--r-- | catalog-be/src/main/java/org/openecomp/sdc/be/impl/ComponentsUtils.java | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/impl/ComponentsUtils.java b/catalog-be/src/main/java/org/openecomp/sdc/be/impl/ComponentsUtils.java index 9f6fb9fe89..0d9e21a66a 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/impl/ComponentsUtils.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/impl/ComponentsUtils.java @@ -16,6 +16,8 @@ * See the License for the specific language governing permissions and * limitations under the License. * ============LICENSE_END========================================================= + * Modifications copyright (c) 2019 Nokia + * ================================================================================ */ package org.openecomp.sdc.be.impl; @@ -41,6 +43,8 @@ import org.openecomp.sdc.be.auditing.impl.usersadmin.AuditUserAdminEventFactory; import org.openecomp.sdc.be.components.impl.ImportUtils; import org.openecomp.sdc.be.components.impl.ImportUtils.ResultStatusEnum; import org.openecomp.sdc.be.components.impl.ResponseFormatManager; +import org.openecomp.sdc.be.components.impl.exceptions.ByActionStatusComponentException; +import org.openecomp.sdc.be.components.impl.exceptions.ByResponseFormatComponentException; import org.openecomp.sdc.be.components.impl.exceptions.ComponentException; import org.openecomp.sdc.be.config.BeEcompErrorManager; import org.openecomp.sdc.be.dao.api.ActionStatus; @@ -1516,15 +1520,21 @@ public class ComponentsUtils { } return result; } - - + public ResponseFormat getResponseFormat(ComponentException exception) { - ResponseFormat responseFormat = exception.getResponseFormat(); - if (responseFormat != null) { - return responseFormat; - } + return exception instanceof ByResponseFormatComponentException ? + getResponseFormat((ByResponseFormatComponentException) exception): + getResponseFormat((ByActionStatusComponentException) exception); + } + + public ResponseFormat getResponseFormat(ByResponseFormatComponentException exception) { + return exception.getResponseFormat(); + } + + public ResponseFormat getResponseFormat(ByActionStatusComponentException exception) { return getResponseFormat(exception.getActionStatus(), exception.getParams()); } + public ActionStatus convertFromStorageResponseForRelationshipType( StorageOperationStatus storageResponse) { ActionStatus responseEnum; |