diff options
Diffstat (limited to 'src/main/java/org/onap/music/datastore')
3 files changed, 49 insertions, 36 deletions
diff --git a/src/main/java/org/onap/music/datastore/MusicDataStore.java b/src/main/java/org/onap/music/datastore/MusicDataStore.java index 9e3a4bf8..c6b022cc 100644 --- a/src/main/java/org/onap/music/datastore/MusicDataStore.java +++ b/src/main/java/org/onap/music/datastore/MusicDataStore.java @@ -70,33 +70,10 @@ public class MusicDataStore { - /** - * @param session - */ - public void setSession(Session session) { - this.session = session; - } - - /** - * @param session - */ - public Session getSession() { - return session; - } - - /** - * @param cluster - */ - public void setCluster(Cluster cluster) { - this.cluster = cluster; - } - - - private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(MusicDataStore.class); /** - * + * */ public MusicDataStore() { connectToCassaCluster(); @@ -113,7 +90,7 @@ public class MusicDataStore { } /** - * + * * @param remoteIp * @throws MusicServiceException */ @@ -121,10 +98,34 @@ public class MusicDataStore { try { connectToCassaCluster(remoteIp); } catch (MusicServiceException e) { + logger.error("Exception", e); logger.error(EELFLoggerDelegate.errorLogger, e.getMessage()); } } + + + /** + * @param session + */ + public void setSession(Session session) { + this.session = session; + } + + /** + * @param session + */ + public Session getSession() { + return session; + } + + /** + * @param cluster + */ + public void setCluster(Cluster cluster) { + this.cluster = cluster; + } + /** * * @return @@ -134,16 +135,18 @@ public class MusicDataStore { try { Enumeration<NetworkInterface> en = NetworkInterface.getNetworkInterfaces(); while (en.hasMoreElements()) { - NetworkInterface ni = (NetworkInterface) en.nextElement(); + NetworkInterface ni = en.nextElement(); Enumeration<InetAddress> ee = ni.getInetAddresses(); while (ee.hasMoreElements()) { - InetAddress ia = (InetAddress) ee.nextElement(); + InetAddress ia = ee.nextElement(); allPossibleIps.add(ia.getHostAddress()); } } } catch (SocketException e) { + logger.error("Exception", e); logger.error(EELFLoggerDelegate.errorLogger, e.getMessage(), AppMessages.CONNCECTIVITYERROR, ErrorSeverity.ERROR, ErrorTypes.CONNECTIONERROR); }catch(Exception e) { + logger.error("Exception", e); logger.error(EELFLoggerDelegate.errorLogger, e.getMessage(), ErrorSeverity.ERROR, ErrorTypes.GENERALSERVICEERROR); } return allPossibleIps; @@ -190,6 +193,7 @@ public class MusicDataStore { break; } catch (NoHostAvailableException e) { + logger.error("Exception", e); address = it.next(); logger.error(EELFLoggerDelegate.errorLogger, e.getMessage(),AppMessages.HOSTUNAVAILABLE, ErrorSeverity.ERROR, ErrorTypes.CONNECTIONERROR); } @@ -236,6 +240,7 @@ public class MusicDataStore { try { session = cluster.connect(); } catch (Exception ex) { + logger.error("Exception", ex); logger.error(EELFLoggerDelegate.errorLogger, ex.getMessage(),AppMessages.CASSANDRACONNECTIVITY, ErrorSeverity.ERROR, ErrorTypes.SERVICEUNAVAILABLE); throw new MusicServiceException( "Error while connecting to Cassandra cluster.. " + ex.getMessage()); @@ -306,8 +311,7 @@ public class MusicDataStore { public byte[] getBlobValue(Row row, String colName, DataType colType) { ByteBuffer bb = row.getBytes(colName); - byte[] data = bb.array(); - return data; + return bb.array(); } public boolean doesRowSatisfyCondition(Row row, Map<String, Object> condition) throws Exception { @@ -338,7 +342,7 @@ public class MusicDataStore { ColumnDefinitions colInfo = row.getColumnDefinitions(); HashMap<String, Object> resultOutput = new HashMap<>(); for (Definition definition : colInfo) { - if (!definition.getName().equals("vector_ts")) { + if (!(("vector_ts").equals(definition.getName()))) { if(definition.getType().toString().toLowerCase().contains("blob")) { resultOutput.put(definition.getName(), getBlobValue(row, definition.getName(), definition.getType())); @@ -386,9 +390,11 @@ public class MusicDataStore { preparedInsert = session.prepare(queryObject.getQuery()); } catch(InvalidQueryException iqe) { + logger.error("Exception", iqe); logger.error(EELFLoggerDelegate.errorLogger, iqe.getMessage(),AppMessages.QUERYERROR, ErrorSeverity.CRITICAL, ErrorTypes.QUERYERROR); throw new MusicQueryException(iqe.getMessage()); }catch(Exception e) { + logger.error("Exception", e); logger.error(EELFLoggerDelegate.errorLogger, e.getMessage(),AppMessages.QUERYERROR, ErrorSeverity.CRITICAL, ErrorTypes.QUERYERROR); throw new MusicQueryException(e.getMessage()); } @@ -407,10 +413,12 @@ public class MusicDataStore { } catch (AlreadyExistsException ae) { + logger.error("Exception", ae); logger.error(EELFLoggerDelegate.errorLogger, ae.getMessage(),AppMessages.SESSIONFAILED+ " [" + queryObject.getQuery() + "]", ErrorSeverity.ERROR, ErrorTypes.QUERYERROR); throw new MusicServiceException(ae.getMessage()); } catch (Exception e) { + logger.error("Exception", e); logger.error(EELFLoggerDelegate.errorLogger, e.getMessage(),AppMessages.SESSIONFAILED+ " [" + queryObject.getQuery() + "]", ErrorSeverity.ERROR, ErrorTypes.QUERYERROR); throw new MusicQueryException("Executing Session Failure for Request = " + "[" + queryObject.getQuery() + "]" + " Reason = " + e.getMessage()); @@ -446,6 +454,7 @@ public class MusicDataStore { results = session.execute(preparedEventualGet.bind(queryObject.getValues().toArray())); } catch (Exception ex) { + logger.error("Exception", ex); logger.error(EELFLoggerDelegate.errorLogger, ex.getMessage(),AppMessages.UNKNOWNERROR+ "[" + queryObject.getQuery() + "]", ErrorSeverity.ERROR, ErrorTypes.QUERYERROR); throw new MusicServiceException(ex.getMessage()); } @@ -476,6 +485,7 @@ public class MusicDataStore { try { results = session.execute(preparedEventualGet.bind(queryObject.getValues().toArray())); } catch (Exception ex) { + logger.error("Exception", ex); logger.error(EELFLoggerDelegate.errorLogger, ex.getMessage(),AppMessages.UNKNOWNERROR+ "[" + queryObject.getQuery() + "]", ErrorSeverity.ERROR, ErrorTypes.QUERYERROR); throw new MusicServiceException(ex.getMessage()); } diff --git a/src/main/java/org/onap/music/datastore/jsonobjects/AAFResponse.java b/src/main/java/org/onap/music/datastore/jsonobjects/AAFResponse.java index df6089ee..b0f41311 100644 --- a/src/main/java/org/onap/music/datastore/jsonobjects/AAFResponse.java +++ b/src/main/java/org/onap/music/datastore/jsonobjects/AAFResponse.java @@ -2,7 +2,9 @@ * ============LICENSE_START========================================== * org.onap.music * =================================================================== - * Copyright (c) 2017 AT&T Intellectual Property + * Copyright (c) 2017 AT&T Intellectual Property + * =================================================================== + * Modifications Copyright (c) 2018 IBM * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,21 +23,22 @@ */ package org.onap.music.datastore.jsonobjects; -import java.util.ArrayList; +import java.util.List; + import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @ApiModel(value = "JsonTable", description = "Reponse class for AAF request") public class AAFResponse { - private ArrayList<NameSpace> ns = null; + private List<NameSpace> ns = null; @ApiModelProperty(value = "Namespace value") - public ArrayList<NameSpace> getNs() { + public List<NameSpace> getNs() { return ns; } - public void setNs(ArrayList<NameSpace> ns) { + public void setNs(List<NameSpace> ns) { this.ns = ns; } diff --git a/src/main/java/org/onap/music/datastore/jsonobjects/JsonSelect.java b/src/main/java/org/onap/music/datastore/jsonobjects/JsonSelect.java index ef56c5de..73237cd2 100644 --- a/src/main/java/org/onap/music/datastore/jsonobjects/JsonSelect.java +++ b/src/main/java/org/onap/music/datastore/jsonobjects/JsonSelect.java @@ -3,6 +3,7 @@ * org.onap.music * =================================================================== * Copyright (c) 2017 AT&T Intellectual Property + * Modifications Copyright (C) 2018 IBM. * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -52,7 +53,6 @@ public class JsonSelect implements Serializable { } catch (IOException e) { // TODO Auto-generated catch block logger.error("Error", e); - e.printStackTrace(); } return bos.toByteArray(); } |