diff options
Diffstat (limited to 'catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/DaoStatusConverter.java')
-rw-r--r-- | catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/DaoStatusConverter.java | 98 |
1 files changed, 42 insertions, 56 deletions
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/DaoStatusConverter.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/DaoStatusConverter.java index bce7a2a73c..14611ae4ad 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/DaoStatusConverter.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/DaoStatusConverter.java @@ -7,9 +7,9 @@ * 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. @@ -17,7 +17,6 @@ * limitations under the License. * ============LICENSE_END========================================================= */ - package org.openecomp.sdc.be.model.operations.impl; import org.openecomp.sdc.be.dao.cassandra.CassandraOperationStatus; @@ -27,53 +26,41 @@ import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus; public class DaoStatusConverter { public static StorageOperationStatus convertJanusGraphStatusToStorageStatus(JanusGraphOperationStatus janusGraphStatus) { - if (janusGraphStatus == null) { return StorageOperationStatus.GENERAL_ERROR; } - switch (janusGraphStatus) { - - case OK: - return StorageOperationStatus.OK; - - case NOT_CONNECTED: - return StorageOperationStatus.CONNECTION_FAILURE; - - case NOT_FOUND: - return StorageOperationStatus.NOT_FOUND; - - case NOT_CREATED: - return StorageOperationStatus.SCHEMA_ERROR; - - case INDEX_CANNOT_BE_CHANGED: - return StorageOperationStatus.SCHEMA_ERROR; - - case MISSING_UNIQUE_ID: - return StorageOperationStatus.BAD_REQUEST; - case ALREADY_LOCKED: - return StorageOperationStatus.FAILED_TO_LOCK_ELEMENT; - - case JANUSGRAPH_SCHEMA_VIOLATION: - return StorageOperationStatus.SCHEMA_VIOLATION; - - case INVALID_ID: - return StorageOperationStatus.INVALID_ID; - case MATCH_NOT_FOUND: - return StorageOperationStatus.MATCH_NOT_FOUND; - - case ILLEGAL_ARGUMENT: - return StorageOperationStatus.BAD_REQUEST; - case ALREADY_EXIST: - return StorageOperationStatus.ENTITY_ALREADY_EXISTS; - case PROPERTY_NAME_ALREADY_EXISTS: - return StorageOperationStatus.PROPERTY_NAME_ALREADY_EXISTS; - case INVALID_PROPERTY: - return StorageOperationStatus.INVALID_PROPERTY; - default: - return StorageOperationStatus.GENERAL_ERROR; + case OK: + return StorageOperationStatus.OK; + case NOT_CONNECTED: + return StorageOperationStatus.CONNECTION_FAILURE; + case NOT_FOUND: + return StorageOperationStatus.NOT_FOUND; + case NOT_CREATED: + return StorageOperationStatus.SCHEMA_ERROR; + case INDEX_CANNOT_BE_CHANGED: + return StorageOperationStatus.SCHEMA_ERROR; + case MISSING_UNIQUE_ID: + return StorageOperationStatus.BAD_REQUEST; + case ALREADY_LOCKED: + return StorageOperationStatus.FAILED_TO_LOCK_ELEMENT; + case JANUSGRAPH_SCHEMA_VIOLATION: + return StorageOperationStatus.SCHEMA_VIOLATION; + case INVALID_ID: + return StorageOperationStatus.INVALID_ID; + case MATCH_NOT_FOUND: + return StorageOperationStatus.MATCH_NOT_FOUND; + case ILLEGAL_ARGUMENT: + return StorageOperationStatus.BAD_REQUEST; + case ALREADY_EXIST: + return StorageOperationStatus.ENTITY_ALREADY_EXISTS; + case PROPERTY_NAME_ALREADY_EXISTS: + return StorageOperationStatus.PROPERTY_NAME_ALREADY_EXISTS; + case INVALID_PROPERTY: + return StorageOperationStatus.INVALID_PROPERTY; + default: + return StorageOperationStatus.GENERAL_ERROR; } - } public static StorageOperationStatus convertCassandraStatusToStorageStatus(CassandraOperationStatus status) { @@ -81,17 +68,16 @@ public class DaoStatusConverter { return StorageOperationStatus.GENERAL_ERROR; } switch (status) { - case OK: - return StorageOperationStatus.OK; - case CLUSTER_NOT_CONNECTED: - return StorageOperationStatus.CONNECTION_FAILURE; - case KEYSPACE_NOT_CONNECTED: - return StorageOperationStatus.STORAGE_NOT_AVAILABLE; - case NOT_FOUND: - return StorageOperationStatus.NOT_FOUND; - - default: - return StorageOperationStatus.GENERAL_ERROR; + case OK: + return StorageOperationStatus.OK; + case CLUSTER_NOT_CONNECTED: + return StorageOperationStatus.CONNECTION_FAILURE; + case KEYSPACE_NOT_CONNECTED: + return StorageOperationStatus.STORAGE_NOT_AVAILABLE; + case NOT_FOUND: + return StorageOperationStatus.NOT_FOUND; + default: + return StorageOperationStatus.GENERAL_ERROR; } } } |