Reformat catalog-dao

[sdc.git] / catalog-dao / src / main / java / org / openecomp / sdc / be / dao / cassandra / CassandraDao.java

diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/CassandraDao.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/CassandraDao.java
index 5ff2917..885d82f 100644 (file)
--- a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/CassandraDao.java
+++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/CassandraDao.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,50 +17,41 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.be.dao.cassandra;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-
 import com.datastax.driver.core.ResultSet;
 import com.datastax.driver.core.Session;
 import com.datastax.driver.core.Statement;
 import com.datastax.driver.core.querybuilder.QueryBuilder;
 import com.datastax.driver.mapping.MappingManager;
-
 import fj.data.Either;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 
 public abstract class CassandraDao {
 
-       private static Logger logger = LoggerFactory.getLogger(CassandraDao.class.getName());
-
-       protected Session session;
-       protected MappingManager manager;
-
-       @Autowired
-       protected CassandraClient client;
-
-       /**
-        * the method checks if the given table is empty under the keyspace the
-        * session was opened to.
-        * 
-        * @param tableName
-        *            the name of the table we want to check
-        * @return returns true if the table was empty
-        */
-       protected Either<Boolean, CassandraOperationStatus> isTableEmpty(String tableName) {
-
-               Statement select = QueryBuilder.select().countAll().from(tableName).limit(10);
-               try {
-                       ResultSet res = session.execute(select);
-                       return Either.left((res.one().getLong("count") != 0 ? false : true));
-
-               } catch (Exception e) {
-                       logger.debug("Failed check if table is empty", e);
-                       return Either.right(CassandraOperationStatus.GENERAL_ERROR);
-               }
-       }
-
+    private static Logger logger = Logger.getLogger(CassandraDao.class.getName());
+    protected Session session;
+    protected MappingManager manager;
+    protected CassandraClient client;
+
+    public CassandraDao(CassandraClient cassandraClient) {
+        this.client = cassandraClient;
+    }
+
+    /**
+     * the method checks if the given table is empty under the keyspace the session was opened to.
+     *
+     * @param tableName the name of the table we want to check
+     * @return returns true if the table was empty
+     */
+    protected Either<Boolean, CassandraOperationStatus> isTableEmpty(String tableName) {
+        Statement select = QueryBuilder.select().countAll().from(tableName).limit(10);
+        try {
+            ResultSet res = session.execute(select);
+            return Either.left(res.one().getLong("count") == 0);
+        } catch (Exception e) {
+            logger.debug("Failed check if table is empty", e);
+            return Either.right(CassandraOperationStatus.GENERAL_ERROR);
+        }
+    }
 }