X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fmusic%2Fdatastore%2FMusicDataStoreHandle.java;fp=src%2Fmain%2Fjava%2Forg%2Fonap%2Fmusic%2Fdatastore%2FMusicDataStoreHandle.java;h=0000000000000000000000000000000000000000;hb=11ee6836d6f25a1becdea60a322a72fbffd4b8b6;hp=92457d0738eb72ffdf1e199a9bc0266ede471b9a;hpb=a00014e78f18134f998fb46a7dd543e6ea05a3bd;p=music.git

diff --git a/src/main/java/org/onap/music/datastore/MusicDataStoreHandle.java b/src/main/java/org/onap/music/datastore/MusicDataStoreHandle.java
deleted file mode 100644
index 92457d07..00000000
--- a/src/main/java/org/onap/music/datastore/MusicDataStoreHandle.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * ============LICENSE_START==========================================
- * org.onap.music
- * ===================================================================
- *  Copyright (c) 2017 AT&T Intellectual Property
- *  Modifications Copyright (C) 2019 IBM.
- * ===================================================================
- *  Modifications Copyright (c) 2019 Samsung
- * ===================================================================
- *  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.onap.music.datastore;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.onap.music.eelf.logging.EELFLoggerDelegate;
-import org.onap.music.exceptions.MusicServiceException;
-import org.onap.music.main.MusicUtil;
-
-import com.datastax.driver.core.KeyspaceMetadata;
-import com.datastax.driver.core.ResultSet;
-import com.datastax.driver.core.TableMetadata;
-
-public class MusicDataStoreHandle {
-
-    private static MusicDataStore mDstoreHandle = null;
-    private static EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(MusicDataStoreHandle.class);
-
-    private MusicDataStoreHandle(){
-        throw new IllegalStateException("Utility class");
-    }
-
-    /**
-    *
-    * @param remoteIp
-    * @return
-    */
-    public static MusicDataStore getDSHandle(String remoteIp) {
-        logger.info(EELFLoggerDelegate.metricsLogger,"Acquiring data store handle");
-        long start = System.currentTimeMillis();
-        if (mDstoreHandle == null) {
-            mDstoreHandle = new MusicDataStore(remoteIp);
-        }
-        long end = System.currentTimeMillis();
-        logger.info(EELFLoggerDelegate.metricsLogger,"Time taken to acquire data store handle:" + (end - start) + " ms");
-        return mDstoreHandle;
-    }
-
-   /**
-    *
-    * @return
-    * @throws MusicServiceException
-    */
-    public static MusicDataStore getDSHandle() throws MusicServiceException {
-        logger.info(EELFLoggerDelegate.metricsLogger,"Acquiring data store handle");
-        long start = System.currentTimeMillis();
-        if (mDstoreHandle == null) {
-            // Quick Fix - Best to put this into every call to getDSHandle?
-           if (!"localhost".equals(MusicUtil.getMyCassaHost())) {
-                mDstoreHandle = new MusicDataStore(MusicUtil.getMyCassaHost());
-            } else {
-                mDstoreHandle = new MusicDataStore();
-            }
-        }
-        if(mDstoreHandle.getSession() == null) {
-            String message = "Connection to Cassandra has not been enstablished."
-                + " Please check connection properites and reboot.";
-            logger.info(EELFLoggerDelegate.applicationLogger, message);
-            throw new MusicServiceException(message);
-        }
-        long end = System.currentTimeMillis();
-        logger.info(EELFLoggerDelegate.metricsLogger,"Time taken to acquire data store handle:" + (end - start) + " ms");
-        return mDstoreHandle;
-    }
-
-
-   /**
-   *
-   * @param keyspace
-   * @param tablename
-   * @return
-   * @throws MusicServiceException
-   */
-    public static TableMetadata returnColumnMetadata(String keyspace, String tablename) throws MusicServiceException {
-        return getDSHandle().returnColumnMetadata(keyspace, tablename);
-    }
-    
-    /**
-    *
-    * @param keyspace
-    * @param tablename
-    * @return
-    * @throws MusicServiceException
-    */
-     public static KeyspaceMetadata returnkeyspaceMetadata(String keyspace) throws MusicServiceException {
-         return getDSHandle().returnKeyspaceMetadata(keyspace);
-     }
-
-  /**
-  *
-  * @param results
-  * @return
-  * @throws MusicServiceException
-  */
-    public static Map<String, HashMap<String, Object>> marshallResults(ResultSet results) throws MusicServiceException {
-        return getDSHandle().marshalData(results);
-    }
-
-}