re base code

Change-Id: I12a5ca14a6d8a87e9316b9ff362eb131105f98a5
Issue-ID: SDC-1566
Signed-off-by: Michael Lando <ml636r@att.com>

1 files changed, 68 insertions, 88 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 3bda11641b..a66dce139b 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
@@ -20,98 +20,78 @@
 
 package org.openecomp.sdc.be.model.operations.impl;
 
-import org.openecomp.sdc.be.dao.api.ResourceUploadStatus;
 import org.openecomp.sdc.be.dao.cassandra.CassandraOperationStatus;
 import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 
 public class DaoStatusConverter {
 
-	public static StorageOperationStatus convertTitanStatusToStorageStatus(TitanOperationStatus titanStatus) {
-
-		if (titanStatus == null) {
-			return StorageOperationStatus.GENERAL_ERROR;
-		}
-
-		switch (titanStatus) {
-
-		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 TITAN_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 convertRsrcUploadStatusToStorageStatus(ResourceUploadStatus resourceUploadStatus) {
-		if (resourceUploadStatus == null) {
-			return StorageOperationStatus.GENERAL_ERROR;
-		}
-		switch (resourceUploadStatus) {
-		case OK:
-			return StorageOperationStatus.OK;
-		case ALREADY_EXIST:
-			return StorageOperationStatus.ENTITY_ALREADY_EXISTS;
-		case NOT_EXIST:
-			return StorageOperationStatus.ARTIFACT_NOT_FOUND;
-		case SERVICE_NOT_EXIST:
-		case COMPONENT_NOT_EXIST:
-			return StorageOperationStatus.NOT_FOUND;
-		default:
-			return StorageOperationStatus.GENERAL_ERROR;
-		}
-	}
-
-	public static StorageOperationStatus convertCassandraStatusToStorageStatus(CassandraOperationStatus status) {
-		if (status == null) {
-			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;
-		}
-	}
+    public static StorageOperationStatus convertTitanStatusToStorageStatus(TitanOperationStatus titanStatus) {
+
+        if (titanStatus == null) {
+            return StorageOperationStatus.GENERAL_ERROR;
+        }
+
+        switch (titanStatus) {
+
+        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 TITAN_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) {
+        if (status == null) {
+            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;
+        }
+    }
 }