From a1f03a639a2ba38ec5c19e96c3c9d703fa048a8f Mon Sep 17 00:00:00 2001 From: "Tschaen, Brendan" Date: Thu, 15 Nov 2018 10:31:53 -0500 Subject: Revert "music core implemented as a service" This reverts commit 7addd52dc73e6571028ca7f6a018e75ec1c9b0ca. Change-Id: I0875ce10521363b8e17eb6cd2cf9d8848e572bea Issue-ID: MUSIC-189 Signed-off-by: Tschaen, Brendan --- .../java/org/onap/music/eelf/healthcheck/MusicHealthCheck.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/main/java/org/onap/music/eelf/healthcheck/MusicHealthCheck.java') diff --git a/src/main/java/org/onap/music/eelf/healthcheck/MusicHealthCheck.java b/src/main/java/org/onap/music/eelf/healthcheck/MusicHealthCheck.java index 65e19501..5f6329a1 100644 --- a/src/main/java/org/onap/music/eelf/healthcheck/MusicHealthCheck.java +++ b/src/main/java/org/onap/music/eelf/healthcheck/MusicHealthCheck.java @@ -26,10 +26,9 @@ import java.util.UUID; import org.onap.music.datastore.PreparedQueryObject; import org.onap.music.eelf.logging.EELFLoggerDelegate; import org.onap.music.exceptions.MusicServiceException; +import org.onap.music.main.MusicCore; import org.onap.music.main.MusicUtil; import org.onap.music.main.ResultType; -import org.onap.music.service.MusicCoreService; -import org.onap.music.service.impl.MusicCassaCore; import com.datastax.driver.core.ConsistencyLevel; @@ -40,7 +39,6 @@ import com.datastax.driver.core.ConsistencyLevel; public class MusicHealthCheck { private static EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(MusicUtil.class); - private static MusicCoreService musicCore = MusicCassaCore.getInstance(); private String cassandrHost; private String zookeeperHost; @@ -80,7 +78,7 @@ public class MusicHealthCheck { PreparedQueryObject pQuery = new PreparedQueryObject(); pQuery.appendQueryString("insert into admin.healthcheck (id) values (?)"); pQuery.addValue(UUID.randomUUID()); - ResultType rs = musicCore.nonKeyRelatedPut(pQuery, consistency); + ResultType rs = MusicCore.nonKeyRelatedPut(pQuery, consistency); System.out.println(rs); if (rs != null) { return Boolean.TRUE; @@ -96,7 +94,7 @@ public class MusicHealthCheck { pQuery.appendQueryString("CREATE TABLE admin.healthcheck (id uuid PRIMARY KEY)"); ResultType rs = null ; try { - rs = musicCore.nonKeyRelatedPut(pQuery, ConsistencyLevel.ONE.toString()); + rs = MusicCore.nonKeyRelatedPut(pQuery, ConsistencyLevel.ONE.toString()); } catch (MusicServiceException e) { // TODO Auto-generated catch block e.printStackTrace(); -- cgit 1.2.3-korg